From bfbbfd718be8a8aa7e47f22c981fd59be8f41ef6 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 7 Jun 2025 03:07:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=98=B2=E5=BE=A1=E5=A1=94?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/entity/vehicle/Hpj11Entity.java | 13 ++++++++----- .../entity/vehicle/LaserTowerEntity.java | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) 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());