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) {