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

Cleaned up the way we handle bleed tracking.

Browse Source
This commit is contained in:
GJ
2012-03-18 15:22:12 -04:00
parent 6b99d3e5f1
commit bc725f46e8
7 changed files with 47 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ public class Swords {
Users.getProfile(target).addBleedTicks(bleedTicks);
}
else {
plugin.misc.addToBleedQue(entity);
plugin.misc.bleedQue.add(entity);
}
attacker.sendMessage(mcLocale.getString("Swords.EnemyBleeding"));
}
@ -108,41 +108,4 @@ public class Swords {
}
}
}
/**
* Simulate a bleed.
*
* @param plugin mcMMO plugin instance
*/
public static void bleedSimulate(mcMMO plugin) {
/* Add items from Que list to BleedTrack list */
for (LivingEntity entity : plugin.misc.bleedQue) {
plugin.misc.bleedTracker.add(entity);
}
/* Clear the BleedQue list */
plugin.misc.bleedQue = new LivingEntity[plugin.misc.bleedQue.length];
plugin.misc.bleedQuePos = 0;
/* Cleanup any dead entities from the list */
for(LivingEntity entity : plugin.misc.bleedRemovalQue) {
plugin.misc.bleedTracker.remove(entity);
}
/* Clear bleed removal list */
plugin.misc.bleedRemovalQue = new LivingEntity[plugin.misc.bleedRemovalQue.length];
plugin.misc.bleedRemovalQuePos = 0;
/* Bleed monsters/animals */
for (LivingEntity entity : plugin.misc.bleedTracker) {
if (entity == null || entity.isDead()) {
plugin.misc.addToBleedRemovalQue(entity);
continue;
}
else {
Combat.dealDamage(entity, 2);
}
}
}
}

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

@ -90,7 +90,7 @@ public class Taming {
Users.getProfile(target).setBleedTicks(2);
}
else {
plugin.misc.addToBleedQue((LivingEntity)entity);
plugin.misc.bleedQue.add((LivingEntity) entity);
}
master.sendMessage(mcLocale.getString("Combat.Gore"));