Update CapabilityHasPokemobs.java

fixes a possible loop here
Pokecube-Development · May 24, 2020 · d08fdf5 · d08fdf5
1 parent 69ff9c6
commit d08fdf5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/pokecube/adventures/capabilities/CapabilityHasPokemobs.java b/src/main/java/pokecube/adventures/capabilities/CapabilityHasPokemobs.java
@@ -636,7 +636,10 @@ public void setPokemob(final int slot, final ItemStack cube)
         public void onSetTarget(final LivingEntity target, final boolean ignoreCanBattle)
         {
             final LivingEntity old = this.getTarget();
+            // No calling this if we already have that target.
             if (old == target) return;
+            // No calling this if we are the target.
+            if (target == this.getTrainer()) return;
 
             if (!ignoreCanBattle && target != null && !this.canBattle(target, true).test()) return;
 
@@ -660,7 +663,6 @@ public void onSetTarget(final LivingEntity target, final boolean ignoreCanBattle
             }
 
             final IHasPokemobs other = TrainerCaps.getHasPokemobs(target);
-            System.out.println(other + " " + this.getTrainer().getDisplayName().getFormattedText());
             if (other != null) other.onSetTarget(this.getTrainer(), true);
 
             if (target != null && this.getAttackCooldown() <= 0)