From bbdc7d30b50ee84c02bc3b14d7b83c32e0b83ac1 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Sun, 9 Jun 2024 21:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=94=B5=E5=87=BB=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E4=BC=A4=E5=AE=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mcreator/target/mobeffect/ShockMobEffect.java   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/mcreator/target/mobeffect/ShockMobEffect.java b/src/main/java/net/mcreator/target/mobeffect/ShockMobEffect.java
index d9f0cd265..c52f23ec6 100644
--- a/src/main/java/net/mcreator/target/mobeffect/ShockMobEffect.java
+++ b/src/main/java/net/mcreator/target/mobeffect/ShockMobEffect.java
@@ -61,7 +61,6 @@ public class ShockMobEffect extends MobEffect {
                 return;
             }
 
-            living.getPersistentData().putBoolean("TargetShock", true);
             living.getPersistentData().putInt("TargetShockAttacker", source.getId());
 
             if (living.hasEffect(TargetModMobEffects.SHOCK.get())) {
@@ -84,7 +83,6 @@ public class ShockMobEffect extends MobEffect {
         }
 
         if (instance.getEffect().equals(TargetModMobEffects.SHOCK.get())) {
-            living.getPersistentData().remove("TargetShock");
             living.getPersistentData().remove("TargetShockAttacker");
         }
     }
@@ -99,7 +97,6 @@ public class ShockMobEffect extends MobEffect {
         }
 
         if (instance.getEffect().equals(TargetModMobEffects.SHOCK.get())) {
-            living.getPersistentData().remove("TargetShock");
             living.getPersistentData().remove("TargetShockAttacker");
         }
     }
@@ -115,13 +112,13 @@ public class ShockMobEffect extends MobEffect {
                 return;
             }
 
-            if (!living.getPersistentData().contains("TargetShockAttacker") ||
-                    !living.getPersistentData().getBoolean("TargetShock")) {
-                return;
+            Entity entity;
+            if (!living.getPersistentData().contains("TargetShockAttacker")) {
+                entity = null;
+            } else {
+                entity = living.level().getEntity(living.getPersistentData().getInt("TargetShockAttacker"));
             }
 
-            Entity entity = living.level().getEntity(living.getPersistentData().getInt("TargetShockAttacker"));
-
             if (instance.getDuration() % 20 == 0) {
                 living.hurt(TargetModDamageTypes.causeShockDamage(living.level().registryAccess(), entity), 5.0f);