From 3d70e2e3c4a9876f027185a2385c2b99009aa6ed Mon Sep 17 00:00:00 2001 From: tanyaofei Date: Tue, 22 Oct 2024 16:59:50 +0800 Subject: [PATCH] Revert fixing knockback on 1.20.x --- .../FakeServerGamePacketListenerImpl.java | 17 ++--------------- .../FakeServerGamePacketListenerImpl.java | 15 --------------- .../FakeServerGamePacketListenerImpl.java | 17 +---------------- .../FakeServerGamePacketListenerImpl.java | 17 +---------------- 4 files changed, 4 insertions(+), 62 deletions(-) diff --git a/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakeServerGamePacketListenerImpl.java b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakeServerGamePacketListenerImpl.java index 9c0875a..e70a6bb 100644 --- a/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakeServerGamePacketListenerImpl.java +++ b/fakeplayer-v1_20_1/src/main/java/io/github/hello09x/fakeplayer/v1_20_1/network/FakeServerGamePacketListenerImpl.java @@ -6,7 +6,6 @@ import io.github.hello09x.fakeplayer.core.manager.FakeplayerManager; import net.minecraft.network.Connection; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket; -import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerGamePacketListenerImpl; @@ -35,21 +34,9 @@ public class FakeServerGamePacketListenerImpl extends ServerGamePacketListenerIm @Override public void send(Packet packet) { if (packet instanceof ClientboundCustomPayloadPacket p) { + // 接收到自定义的数据包，由于假人没有连接导致 BungeeCord 的插件消息无法正确通过 Proxy 发送 + // 因此将该数据包通过真实的玩家重新发送一份 this.handleCustomPayloadPacket(p); - } else if (packet instanceof ClientboundSetEntityMotionPacket p) { - this.handleClientboundSetEntityMotionPacket(p); - } - } - - /** - * 玩家被击退的动作由客户端完成, 假人没有客户端因此手动完成这个动作 - */ - public void handleClientboundSetEntityMotionPacket(@NotNull ClientboundSetEntityMotionPacket packet) { - if (packet.getId() == this.player.getId() && this.player.hurtMarked) { - Bukkit.getScheduler().runTask(Main.getInstance(), () -> { - this.player.hurtMarked = true; - this.player.lerpMotion(packet.getXa(), packet.getYa(), packet.getZa()); - }); } } diff --git a/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakeServerGamePacketListenerImpl.java b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakeServerGamePacketListenerImpl.java index 5cbfd9c..896da8c 100644 --- a/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakeServerGamePacketListenerImpl.java +++ b/fakeplayer-v1_20_2/src/main/java/io/github/hello09x/fakeplayer/v1_20_2/network/FakeServerGamePacketListenerImpl.java @@ -9,7 +9,6 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.CommonListenerCookie; @@ -40,20 +39,6 @@ public class FakeServerGamePacketListenerImpl extends ServerGamePacketListenerIm public void send(Packet packet) { if (packet instanceof ClientboundCustomPayloadPacket p) { this.handleCustomPayloadPacket(p.payload()); - } else if (packet instanceof ClientboundSetEntityMotionPacket p) { - this.handleClientboundSetEntityMotionPacket(p); - } - } - - /** - * 玩家被击退的动作由客户端完成, 假人没有客户端因此手动完成这个动作 - */ - public void handleClientboundSetEntityMotionPacket(@NotNull ClientboundSetEntityMotionPacket packet) { - if (packet.getId() == this.player.getId() && this.player.hurtMarked) { - Bukkit.getScheduler().runTask(Main.getInstance(), () -> { - this.player.hurtMarked = true; - this.player.lerpMotion(packet.getXa(), packet.getYa(), packet.getZa()); - }); } } diff --git a/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakeServerGamePacketListenerImpl.java b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakeServerGamePacketListenerImpl.java index b24a457..87c9bb4 100644 --- a/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakeServerGamePacketListenerImpl.java +++ b/fakeplayer-v1_20_4/src/main/java/io/github/hello09x/fakeplayer/v1_20_4/network/FakeServerGamePacketListenerImpl.java @@ -9,7 +9,6 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.CommonListenerCookie; @@ -36,24 +35,10 @@ public class FakeServerGamePacketListenerImpl extends ServerGamePacketListenerIm .ifPresent(p -> p.addChannel(BUNGEE_CORD_CORRECTED_CHANNEL)); } - @Override + @Override public void send(Packet packet) { if (packet instanceof ClientboundCustomPayloadPacket p) { this.handleCustomPayloadPacket(p.payload()); - } else if (packet instanceof ClientboundSetEntityMotionPacket p) { - this.handleClientboundSetEntityMotionPacket(p); - } - } - - /** - * 玩家被击退的动作由客户端完成, 假人没有客户端因此手动完成这个动作 - */ - public void handleClientboundSetEntityMotionPacket(@NotNull ClientboundSetEntityMotionPacket packet) { - if (packet.getId() == this.player.getId() && this.player.hurtMarked) { - Bukkit.getScheduler().runTask(Main.getInstance(), () -> { - this.player.hurtMarked = true; - this.player.lerpMotion(packet.getXa(), packet.getYa(), packet.getZa()); - }); } } diff --git a/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakeServerGamePacketListenerImpl.java b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakeServerGamePacketListenerImpl.java index 51dc7a4..5dc0afb 100644 --- a/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakeServerGamePacketListenerImpl.java +++ b/fakeplayer-v1_20_6/src/main/java/io/github/hello09x/fakeplayer/v1_20_6/network/FakeServerGamePacketListenerImpl.java @@ -7,7 +7,6 @@ import net.minecraft.network.Connection; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket; import net.minecraft.network.protocol.common.custom.DiscardedPayload; -import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.CommonListenerCookie; @@ -36,24 +35,10 @@ public class FakeServerGamePacketListenerImpl extends ServerGamePacketListenerIm .ifPresent(p -> p.addChannel(BUNGEE_CORD_CORRECTED_CHANNEL)); } - @Override + @Override public void send(Packet packet) { if (packet instanceof ClientboundCustomPayloadPacket p) { this.handleCustomPayloadPacket(p); - } else if (packet instanceof ClientboundSetEntityMotionPacket p) { - this.handleClientboundSetEntityMotionPacket(p); - } - } - - /** - * 玩家被击退的动作由客户端完成, 假人没有客户端因此手动完成这个动作 - */ - public void handleClientboundSetEntityMotionPacket(@NotNull ClientboundSetEntityMotionPacket packet) { - if (packet.getId() == this.player.getId() && this.player.hurtMarked) { - Bukkit.getScheduler().runTask(Main.getInstance(), () -> { - this.player.hurtMarked = true; - this.player.lerpMotion(packet.getXa(), packet.getYa(), packet.getZa()); - }); } }