Another fix to make us more compatible with other plugins

This commit is contained in:
nossr50 2012-08-14 14:21:07 -07:00
parent 7b47d32a96
commit f532630d1b
2 changed files with 10 additions and 1 deletions

View File

@ -9,6 +9,7 @@ Key:
Version 1.3.11
+ Added compatibility with bow-wielding NPCs from Citizens/NPC mods
+ Added compatibility for pvp-prevention plugins for Serrated Strikes
= Fixed bug where mcMMO could throw NPE errors if trees cut down were from a custom mod and had an id of 17
= Fixed bug where mcMMO would ignore other block-protection plugins for various abilities

View File

@ -504,6 +504,14 @@ public class Combat {
if (Users.getProfile(defender).getGodMode()) {
return false;
}
//It may seem a bit redundant but we need a check here to prevent bleed from being applied in applyAbilityAoE()
EntityDamageEvent ede = new FakeEntityDamageByEntityEvent(player, entity, EntityDamageEvent.DamageCause.ENTITY_ATTACK, 1);
mcMMO.p.getServer().getPluginManager().callEvent(ede);
if (ede.isCancelled()) {
return false;
}
}
else if (entity instanceof Tameable) {
Tameable pet = (Tameable) entity;