소스 검색

Another fix to make us more compatible with other plugins

nossr50 13 년 전
부모
커밋
f532630d1b
2개의 변경된 파일10개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      Changelog.txt
  2. 9 1
      src/main/java/com/gmail/nossr50/util/Combat.java

+ 1 - 0
Changelog.txt

@@ -9,6 +9,7 @@ Key:
 
 
 Version 1.3.11
 Version 1.3.11
  + Added compatibility with bow-wielding NPCs from Citizens/NPC mods
  + 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 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
  = Fixed bug where mcMMO would ignore other block-protection plugins for various abilities
  
  

+ 9 - 1
src/main/java/com/gmail/nossr50/util/Combat.java

@@ -504,7 +504,15 @@ public class Combat {
             if (Users.getProfile(defender).getGodMode()) {
             if (Users.getProfile(defender).getGodMode()) {
                 return false;
                 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) {
         else if (entity instanceof Tameable) {
             Tameable pet = (Tameable) entity;
             Tameable pet = (Tameable) entity;