(pot.) Fix another strange Effect-Based error

MyPetORG · Nov 23, 2024 · 95d588e · 95d588e
1 parent ff6b974
commit 95d588e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...v1_20_R4/src/main/java/de/Keyle/MyPet/compat/v1_20_R4/entity/ai/movement/FollowOwner.java b/...v1_20_R4/src/main/java/de/Keyle/MyPet/compat/v1_20_R4/entity/ai/movement/FollowOwner.java
@@ -27,6 +27,7 @@
 import de.Keyle.MyPet.compat.v1_20_R4.entity.EntityMyFlyingPet;
 import de.Keyle.MyPet.compat.v1_20_R4.entity.EntityMyPet;
 import de.Keyle.MyPet.compat.v1_20_R4.entity.ai.navigation.MyAquaticPetPathNavigation;
+import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.LivingEntity;
@@ -169,7 +170,7 @@ private void applyWalkSpeed() {
 			// make the pet faster when the player is has the SPEED effect
 			// TODO check if this canbe removed in later versions (again)
 			for(MobEffectInstance eff:owner.getActiveEffects()) {
-				if (eff.getEffect() == MobEffects.MOVEMENT_SPEED) {
+				if (eff.getEffect() instanceof MobEffect && eff.getEffect() == MobEffects.MOVEMENT_SPEED) {
 					walkSpeed += eff.getAmplifier() * 0.2 * walkSpeed;
 					break;
 				}

diff --git a/...v1_21_R1/src/main/java/de/Keyle/MyPet/compat/v1_21_R1/entity/ai/movement/FollowOwner.java b/...v1_21_R1/src/main/java/de/Keyle/MyPet/compat/v1_21_R1/entity/ai/movement/FollowOwner.java
@@ -27,6 +27,7 @@
 import de.Keyle.MyPet.compat.v1_21_R1.entity.EntityMyFlyingPet;
 import de.Keyle.MyPet.compat.v1_21_R1.entity.EntityMyPet;
 import de.Keyle.MyPet.compat.v1_21_R1.entity.ai.navigation.MyAquaticPetPathNavigation;
+import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.LivingEntity;
@@ -168,8 +169,8 @@ private void applyWalkSpeed() {
 		} else if (owner.hasEffect(MobEffects.MOVEMENT_SPEED)) {
 			// make the pet faster when the player is has the SPEED effect
 			// TODO check if this canbe removed in later versions (again)
-			for(MobEffectInstance eff:owner.getActiveEffects()) {
-				if (eff.getEffect() == MobEffects.MOVEMENT_SPEED) {
+			for(MobEffectInstance eff : owner.getActiveEffects()) {
+				if (eff.getEffect() instanceof MobEffect && eff.getEffect() == MobEffects.MOVEMENT_SPEED) {
 					walkSpeed += eff.getAmplifier() * 0.2 * walkSpeed;
 					break;
 				}