EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Made many changes to Bleeding. Capped max Bleed ticks at 10.

Browse Source
This commit is contained in:
nossr50
2012-02-20 15:54:30 -08:00
parent fa35fd9e45
commit c0a7b276b4
12 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
View File

@ -608,9 +608,17 @@ public class PlayerProfile
}
public void setBleedTicks(Integer newvalue){
bleedticks = newvalue;
//Cap maximum ticks at 10
if(bleedticks > 10)
bleedticks = 10;
}
public void addBleedTicks(Integer newvalue){
bleedticks+=newvalue;
//Cap maximum ticks at 10
if(bleedticks > 10)
bleedticks = 10;
}
/*
* EXPLOIT PREVENTION

13
src/main/java/com/gmail/nossr50/runnables/mcTimer.java
View File

@ -21,6 +21,7 @@ import com.gmail.nossr50.Combat;
import com.gmail.nossr50.Users;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.skills.Skills;
import com.gmail.nossr50.skills.Swords;
@ -62,8 +63,18 @@ public class mcTimer implements Runnable
*/
if(thecount % 2 == 0 && PP.getBleedTicks() >= 1)
{
Combat.dealDamage(player, 2);
//Never kill with Bleeding
if(player.getHealth() - 2 < 0)
{
if(player.getHealth() - 1 > 0)
Combat.dealDamage(player, 1);
} else
Combat.dealDamage(player, 2);
PP.decreaseBleedTicks();
if(PP.getBleedTicks() == 0)
player.sendMessage(mcLocale.getString("Swords.StoppedBleeding"));
}
/*