diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Hpj11Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Hpj11Entity.java index db318a41c..4e9329573 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Hpj11Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Hpj11Entity.java @@ -169,13 +169,16 @@ public class Hpj11Entity extends ContainerMobileVehicleEntity implements GeoEnti if (this.getOwnerUUID() == null) { this.setOwnerUUID(player.getUUID()); } + if (this.getOwner() == player) { + entityData.set(ACTIVE, !entityData.get(ACTIVE)); - entityData.set(ACTIVE, !entityData.get(ACTIVE)); - - if (player instanceof ServerPlayer serverPlayer) { - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), SoundEvents.ARROW_HIT_PLAYER, SoundSource.PLAYERS, 0.5F, 1); + if (player instanceof ServerPlayer serverPlayer) { + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), SoundEvents.ARROW_HIT_PLAYER, SoundSource.PLAYERS, 0.5F, 1); + } + return InteractionResult.sidedSuccess(this.level().isClientSide()); + } else { + return InteractionResult.PASS; } - return InteractionResult.sidedSuccess(this.level().isClientSide()); } } entityData.set(TARGET_UUID, "none"); 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 b483004e7..dba03447e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/LaserTowerEntity.java @@ -146,13 +146,16 @@ public class LaserTowerEntity extends EnergyVehicleEntity implements GeoEntity, if (this.getOwnerUUID() == null) { this.setOwnerUUID(player.getUUID()); } + if (this.getOwner() == player) { + entityData.set(ACTIVE, !entityData.get(ACTIVE)); - entityData.set(ACTIVE, !entityData.get(ACTIVE)); - - if (player instanceof ServerPlayer serverPlayer) { - serverPlayer.level().playSound(null, serverPlayer.getOnPos(), SoundEvents.ARROW_HIT_PLAYER, SoundSource.PLAYERS, 0.5F, 1); + if (player instanceof ServerPlayer serverPlayer) { + serverPlayer.level().playSound(null, serverPlayer.getOnPos(), SoundEvents.ARROW_HIT_PLAYER, SoundSource.PLAYERS, 0.5F, 1); + } + return InteractionResult.sidedSuccess(this.level().isClientSide()); + } else { + return InteractionResult.PASS; } - return InteractionResult.sidedSuccess(this.level().isClientSide()); } } return InteractionResult.sidedSuccess(this.level().isClientSide());