diff --git a/Changelog.txt b/Changelog.txt index 054ffdcfb..b381f7efc 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -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 diff --git a/src/main/java/com/gmail/nossr50/util/Combat.java b/src/main/java/com/gmail/nossr50/util/Combat.java index 24df2fba2..7d1618da6 100644 --- a/src/main/java/com/gmail/nossr50/util/Combat.java +++ b/src/main/java/com/gmail/nossr50/util/Combat.java @@ -504,7 +504,15 @@ 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;