From 81582c4e16b8bb3d75ef78f32784862f998b25f1 Mon Sep 17 00:00:00 2001
From: Light_Quanta <zch22248@foxmail.com>
Date: Sun, 8 Jun 2025 04:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DgetUUID=E5=90=84=E7=A7=8D?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E7=9A=84NPE=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/atsuishio/superbwarfare/entity/Blu43Entity.java    | 4 +++-
 .../com/atsuishio/superbwarfare/entity/ClaymoreEntity.java | 4 +++-
 .../com/atsuishio/superbwarfare/entity/Tm62Entity.java     | 4 +++-
 .../superbwarfare/entity/projectile/C4Entity.java          | 7 ++++---
 .../superbwarfare/entity/vehicle/LaserTowerEntity.java     | 4 +++-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/Blu43Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/Blu43Entity.java
index 3daccdcec..38ff1a6e6 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/Blu43Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/Blu43Entity.java
@@ -54,7 +54,9 @@ public class Blu43Entity extends Entity implements GeoEntity, OwnableEntity {
 
     public Blu43Entity(LivingEntity owner, Level level) {
         super(ModEntities.BLU_43.get(), level);
-        this.setOwnerUUID(owner.getUUID());
+        if (owner != null) {
+            this.setOwnerUUID(owner.getUUID());
+        }
     }
 
     @Override
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java
index c08779732..6cb81afaa 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java
@@ -55,7 +55,9 @@ public class ClaymoreEntity extends Entity implements GeoEntity, OwnableEntity {
 
     public ClaymoreEntity(LivingEntity owner, Level level) {
         super(ModEntities.CLAYMORE.get(), level);
-        this.setOwnerUUID(owner.getUUID());
+        if (owner != null) {
+            this.setOwnerUUID(owner.getUUID());
+        }
     }
 
     @Override
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/Tm62Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/Tm62Entity.java
index 97d29c85b..7be9e7a25 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/Tm62Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/Tm62Entity.java
@@ -55,7 +55,9 @@ public class Tm62Entity extends Entity implements GeoEntity, OwnableEntity {
 
     public Tm62Entity(LivingEntity owner, Level level, boolean fuse) {
         super(ModEntities.TM_62.get(), level);
-        this.setOwnerUUID(owner.getUUID());
+        if (owner != null) {
+            this.setOwnerUUID(owner.getUUID());
+        }
         this.entityData.set(FUSE, fuse);
     }
 
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/C4Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/C4Entity.java
index 614932286..99ce97c93 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/C4Entity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/C4Entity.java
@@ -70,13 +70,14 @@ public class C4Entity extends Entity implements GeoEntity, OwnableEntity {
     }
 
     public C4Entity(LivingEntity owner, Level level) {
-        super(ModEntities.C_4.get(), level);
-        this.setOwnerUUID(owner.getUUID());
+        this(owner, level, false);
     }
 
     public C4Entity(LivingEntity owner, Level level, boolean isControllable) {
         super(ModEntities.C_4.get(), level);
-        this.setOwnerUUID(owner.getUUID());
+        if (owner != null) {
+            this.setOwnerUUID(owner.getUUID());
+        }
         this.entityData.set(IS_CONTROLLABLE, isControllable);
     }
 
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java
index dba03447e..642671cba 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java
@@ -70,7 +70,9 @@ public class LaserTowerEntity extends EnergyVehicleEntity implements GeoEntity,
 
     public LaserTowerEntity(LivingEntity owner, Level level) {
         super(ModEntities.LASER_TOWER.get(), level);
-        this.setOwnerUUID(owner.getUUID());
+        if (owner != null) {
+            this.setOwnerUUID(owner.getUUID());
+        }
     }
 
     public boolean isOwnedBy(LivingEntity pEntity) {