kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

修复getUUID各种可能的NPE情况

Browse source
This commit is contained in:
Light_Quanta 2025-06-08 04:32:48 +08:00
parent 661dd7e106
commit 81582c4e16
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
5 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/atsuishio/superbwarfare/entity/Blu43Entity.java
View file

@ -54,8 +54,10 @@ public class Blu43Entity extends Entity implements GeoEntity, OwnableEntity {
public Blu43Entity(LivingEntity owner, Level level) { public Blu43Entity(LivingEntity owner, Level level) {
super(ModEntities.BLU_43.get(), level); super(ModEntities.BLU_43.get(), level);
if (owner != null) {
this.setOwnerUUID(owner.getUUID()); this.setOwnerUUID(owner.getUUID());
} }
}
@Override @Override
protected void defineSynchedData(SynchedEntityData.@NotNull Builder builder) { protected void defineSynchedData(SynchedEntityData.@NotNull Builder builder) {

2
src/main/java/com/atsuishio/superbwarfare/entity/ClaymoreEntity.java
View file

@ -55,8 +55,10 @@ public class ClaymoreEntity extends Entity implements GeoEntity, OwnableEntity {
public ClaymoreEntity(LivingEntity owner, Level level) { public ClaymoreEntity(LivingEntity owner, Level level) {
super(ModEntities.CLAYMORE.get(), level); super(ModEntities.CLAYMORE.get(), level);
if (owner != null) {
this.setOwnerUUID(owner.getUUID()); this.setOwnerUUID(owner.getUUID());
} }
}
@Override @Override
protected void defineSynchedData(SynchedEntityData.Builder builder) { protected void defineSynchedData(SynchedEntityData.Builder builder) {

2
src/main/java/com/atsuishio/superbwarfare/entity/Tm62Entity.java
View file

@ -55,7 +55,9 @@ public class Tm62Entity extends Entity implements GeoEntity, OwnableEntity {
public Tm62Entity(LivingEntity owner, Level level, boolean fuse) { public Tm62Entity(LivingEntity owner, Level level, boolean fuse) {
super(ModEntities.TM_62.get(), level); super(ModEntities.TM_62.get(), level);
if (owner != null) {
this.setOwnerUUID(owner.getUUID()); this.setOwnerUUID(owner.getUUID());
}
this.entityData.set(FUSE, fuse); this.entityData.set(FUSE, fuse);
} }

5
src/main/java/com/atsuishio/superbwarfare/entity/projectile/C4Entity.java
View file

@ -70,13 +70,14 @@ public class C4Entity extends Entity implements GeoEntity, OwnableEntity {
} }
public C4Entity(LivingEntity owner, Level level) { public C4Entity(LivingEntity owner, Level level) {
super(ModEntities.C_4.get(), level); this(owner, level, false);
this.setOwnerUUID(owner.getUUID());
} }
public C4Entity(LivingEntity owner, Level level, boolean isControllable) { public C4Entity(LivingEntity owner, Level level, boolean isControllable) {
super(ModEntities.C_4.get(), level); super(ModEntities.C_4.get(), level);
if (owner != null) {
this.setOwnerUUID(owner.getUUID()); this.setOwnerUUID(owner.getUUID());
}
this.entityData.set(IS_CONTROLLABLE, isControllable); this.entityData.set(IS_CONTROLLABLE, isControllable);
} }

2
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java
View file

@ -70,8 +70,10 @@ public class LaserTowerEntity extends EnergyVehicleEntity implements GeoEntity,
public LaserTowerEntity(LivingEntity owner, Level level) { public LaserTowerEntity(LivingEntity owner, Level level) {
super(ModEntities.LASER_TOWER.get(), level); super(ModEntities.LASER_TOWER.get(), level);
if (owner != null) {
this.setOwnerUUID(owner.getUUID()); this.setOwnerUUID(owner.getUUID());
} }
}
public boolean isOwnedBy(LivingEntity pEntity) { public boolean isOwnedBy(LivingEntity pEntity) {
return pEntity == this.getOwner(); return pEntity == this.getOwner();