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

Capped bleeding ticks for monsters, moved players bleeding to BleedTimer

Browse Source
This commit is contained in:
bm01
2012-04-28 06:14:19 +02:00
parent b46997bc1a
commit 9e98351923
8 changed files with 163 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/gmail/nossr50/skills/Swords.java
View File

@ -57,22 +57,16 @@ public class Swords {
int skillCheck = Misc.skillCheck(skillLevel, MAX_BONUS_LEVEL);
if (random.nextInt(1000) <= skillCheck && !entity.isDead()) {
if (entity instanceof Player) {
Player target = (Player) entity;
int bleedTicks;
int bleedTicks = 0;
if (skillLevel >= 750) {
bleedTicks = 3;
}
else {
bleedTicks = 2;
}
Users.getProfile(target).addBleedTicks(bleedTicks);
if (skillLevel >= 750) {
bleedTicks = 3;
}
else {
BleedTimer.add(entity);
bleedTicks = 2;
}
BleedTimer.add(entity, bleedTicks);
attacker.sendMessage(LocaleLoader.getString("Swords.Combat.Bleeding"));
}
}

10
src/main/java/com/gmail/nossr50/skills/Taming.java
View File

@ -92,14 +92,10 @@ public class Taming {
event.setDamage(event.getDamage() * GORE_MULTIPLIER);
if (entity instanceof Player) {
Player target = (Player) entity;
((Player) entity).sendMessage(LocaleLoader.getString("Combat.StruckByGore"));
}
target.sendMessage(LocaleLoader.getString("Combat.StruckByGore"));
Users.getProfile(target).addBleedTicks(2);
}
else {
BleedTimer.add((LivingEntity) entity);
}
BleedTimer.add((LivingEntity) entity, 2);
master.sendMessage(LocaleLoader.getString("Combat.Gore"));
}