瀏覽代碼

Fixed combat exp gain when hitting a friendly wolf

bm01 12 年之前
父節點
當前提交
29fb8b83c2
共有 1 個文件被更改,包括 4 次插入0 次删除
  1. 4 0
      src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java

+ 4 - 0
src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java

@@ -69,6 +69,10 @@ public final class CombatTools {
                 return;
                 return;
             }
             }
 
 
+            if (target instanceof Tameable && isFriendlyPet(player, (Tameable) target)) {
+                return;
+            }
+
             ItemStack heldItem = player.getItemInHand();
             ItemStack heldItem = player.getItemInHand();
             Material heldItemType = heldItem.getType();
             Material heldItemType = heldItem.getType();
             DamageCause damageCause = event.getCause();
             DamageCause damageCause = event.getCause();