fix errors from non-deadly mobs in weapon_damage

DenizenScript · Nov 10, 2019 · 7e6ab8b · 7e6ab8b
1 parent fabc44f
commit 7e6ab8b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/EntityHelperImpl.java b/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/EntityHelperImpl.java
@@ -11,6 +11,7 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.block.BlockFace;
 import org.bukkit.craftbukkit.v1_12_R1.CraftWorld;
 import org.bukkit.craftbukkit.v1_12_R1.entity.CraftAnimals;
@@ -44,7 +45,11 @@ public double getDamageTo(LivingEntity attacker, Entity target) {
         else {
             monsterType = EnumMonsterType.UNDEFINED;
         }
-        double damage = attacker.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE).getValue();
+        double damage = 0;
+        AttributeInstance attrib = attacker.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE);
+        if (attrib != null) {
+            damage = attrib.getValue();
+        }
         if (attacker.getEquipment() != null && attacker.getEquipment().getItemInMainHand() != null) {
             damage += EnchantmentManager.a(CraftItemStack.asNMSCopy(attacker.getEquipment().getItemInMainHand()), monsterType);
         }

diff --git a/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/EntityHelperImpl.java b/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/EntityHelperImpl.java
@@ -14,6 +14,7 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.block.BlockFace;
 import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
 import org.bukkit.craftbukkit.v1_13_R2.block.CraftBlock;
@@ -44,7 +45,11 @@ public double getDamageTo(LivingEntity attacker, Entity target) {
         else {
             monsterType = EnumMonsterType.UNDEFINED;
         }
-        double damage = attacker.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE).getValue();
+        double damage = 0;
+        AttributeInstance attrib = attacker.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE);
+        if (attrib != null) {
+            damage = attrib.getValue();
+        }
         if (attacker.getEquipment() != null && attacker.getEquipment().getItemInMainHand() != null) {
             damage += EnchantmentManager.a(CraftItemStack.asNMSCopy(attacker.getEquipment().getItemInMainHand()), monsterType);
         }

diff --git a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java
@@ -15,6 +15,7 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.block.BlockFace;
 import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
 import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock;
@@ -63,7 +64,11 @@ public double getDamageTo(LivingEntity attacker, Entity target) {
         else {
             monsterType = EnumMonsterType.UNDEFINED;
         }
-        double damage = attacker.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE).getValue();
+        double damage = 0;
+        AttributeInstance attrib = attacker.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE);
+        if (attrib != null) {
+            damage = attrib.getValue();
+        }
         if (attacker.getEquipment() != null && attacker.getEquipment().getItemInMainHand() != null) {
             damage += EnchantmentManager.a(CraftItemStack.asNMSCopy(attacker.getEquipment().getItemInMainHand()), monsterType);
         }