diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPacketListenerMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPacketListenerMixin.java index 89924c94e..a76976e37 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPacketListenerMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/ClientPacketListenerMixin.java @@ -16,9 +16,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -/** - * Code based on @Luke100000's ImmersiveAircraft - */ @Mixin(ClientPacketListener.class) public abstract class ClientPacketListenerMixin { @@ -64,6 +61,7 @@ public abstract class ClientPacketListenerMixin { Entity passenger = this.level.getEntity(i); if (passenger != null) { passenger.startRiding(entity, true); + if (passenger == player && !hasIndirectPassenger) { Component component = Component.translatable("mount.onboard", ModKeyMappings.DISMOUNT.getTranslatedKeyMessage()); this.minecraft.gui.setOverlayMessage(component, false); @@ -75,29 +73,4 @@ public abstract class ClientPacketListenerMixin { vehicle.entityIndexOverride = null; } - - @Inject(method = "handleSetEntityPassengersPacket(Lnet/minecraft/network/protocol/game/ClientboundSetPassengersPacket;)V", at = @At("TAIL")) - public void handleSetEntityPassengersPacket(ClientboundSetPassengersPacket pPacket, CallbackInfo ci) { - Entity entity = this.level.getEntity(pPacket.getVehicle()); - if (entity == null) return; - - var player = this.minecraft.player; - assert player != null; - - boolean hasIndirectPassenger = entity.hasIndirectPassenger(this.minecraft.player); - for (int i : pPacket.getPassengers()) { - Entity passenger = this.level.getEntity(i); - if (passenger != null && (passenger == this.minecraft.player || hasIndirectPassenger)) { - if (entity instanceof VehicleEntity) { -// this.minecraft.player.yRotO = entity.getYRot(); -// this.minecraft.player.setYRot(entity.getYRot()); -// this.minecraft.player.setYHeadRot(entity.getYRot()); - - Component component = Component.translatable("mount.onboard", ModKeyMappings.DISMOUNT.getTranslatedKeyMessage()); - this.minecraft.gui.setOverlayMessage(component, false); - this.minecraft.getNarrator().sayNow(component); - } - } - } - } }