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

Re-added event calling

Browse Source 
Re-added other dealDamage methods
Added FakeEntityDamageByEntityEvent for us to filter our own mess out, this was the issue with Skull Splitter and Serrated Strikes earlier (a loop)
Moved FakeBlockBreakEvent to be with other events
Added configuration option to control event calling
Learned how to changelog
Broke those cuffs
This commit is contained in:
NuclearW
2012-02-15 16:57:48 -05:00
parent 06d3d8a18f
commit 40af51fc05
10 changed files with 106 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/Axes.java
View File

@ -164,7 +164,7 @@ public class Axes {
if(targets >= 1 && derp.getWorld().getPVP())
{
Combat.dealDamage(target, dmgAmount);
Combat.dealDamage(target, dmgAmount, attacker);
target.sendMessage(ChatColor.DARK_RED+"Struck by CLEAVE!");
targets--;
continue;
@ -174,7 +174,7 @@ public class Axes {
else
{
LivingEntity target = (LivingEntity)derp;
Combat.dealDamage(target, dmgAmount);
Combat.dealDamage(target, dmgAmount, attacker);
targets--;
}
}

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

@ -152,7 +152,7 @@ public class Swords
continue;
if(targets >= 1 && derp.getWorld().getPVP())
{
Combat.dealDamage(target, dmgAmount);
Combat.dealDamage(target, dmgAmount, attacker);
target.sendMessage(ChatColor.DARK_RED+"Struck by Serrated Strikes!");
Users.getProfile(target).addBleedTicks(5);
targets--;
@ -165,7 +165,7 @@ public class Swords
pluginx.misc.addToBleedQue((LivingEntity)derp);
LivingEntity target = (LivingEntity)derp;
Combat.dealDamage(target, dmgAmount);
Combat.dealDamage(target, dmgAmount, attacker);
targets--;
}
}