Treat own wolves as allies (#1489)

RobotHanzo · web-flow · commit be705b16ead3 · 2025-12-13T14:02:18.000-07:00
* Fix wolf not ally

* Consider own wolf as ally as well

* Remove redundant check

* Fix isAlly method to cast target correctly
diff --git a/src/main/java/studio/magemonkey/fabled/data/Settings.java b/src/main/java/studio/magemonkey/fabled/data/Settings.java
@@ -995,7 +995,8 @@ public boolean canAttack(LivingEntity attacker, LivingEntity target, EntityDamag
      * @return true if an ally, false otherwise
      */
     public boolean isAlly(LivingEntity attacker, LivingEntity target) {
-        return !canAttack(attacker, target);
+        return !canAttack(attacker, target) || (target instanceof Wolf && ((Wolf) target).isTamed()
+                && (attacker.equals(((Wolf) target).getOwner())));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -995,7 +995,8 @@ public boolean canAttack(LivingEntity attacker, LivingEntity target, EntityDamag`
`995`	`995`	`* @return true if an ally, false otherwise`
`996`	`996`	`*/`
`997`	`997`	`public boolean isAlly(LivingEntity attacker, LivingEntity target) {`
`998`		`- return !canAttack(attacker, target);`
	`998`	`+ return !canAttack(attacker, target) \|\| (target instanceof Wolf && ((Wolf) target).isTamed()`
	`999`	`+ && (attacker.equals(((Wolf) target).getOwner())));`
`999`	`1000`	`}`
`1000`	`1001`
`1001`	`1002`	`/**`