From 58234c469c281d63965a6673f110105343fc56f1 Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 9 Oct 2023 00:56:44 +0800 Subject: [PATCH] Override more connection send methods --- .../nms/v1_20_R2/network/EmptyConnection.java | 8 ++++++++ .../java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/network/EmptyConnection.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/network/EmptyConnection.java index c10cc4d26..64a0886dd 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/network/EmptyConnection.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/network/EmptyConnection.java @@ -25,10 +25,18 @@ public class EmptyConnection extends Connection { return true; } + @Override + public void send(Packet packet) { + } + @Override public void send(Packet packet, PacketSendListener genericfuturelistener) { } + @Override + public void send(Packet packet, PacketSendListener genericfuturelistener, boolean flag) { + } + @Override public void setListener(PacketListener pl) { try { diff --git a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java index 2e81286a1..9e6bc27e8 100644 --- a/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java +++ b/v1_20_R2/src/main/java/net/citizensnpcs/nms/v1_20_R2/util/NMSImpl.java @@ -1298,9 +1298,6 @@ public class NMSImpl implements NMSBridge { public void removeFromWorld(org.bukkit.entity.Entity entity) { Preconditions.checkNotNull(entity); Entity nmsEntity = ((CraftEntity) entity).getHandle(); - ServerLevel level = (ServerLevel) nmsEntity.level(); - if (level.getEntity(entity.getEntityId()) == null) - return; ((ServerLevel) nmsEntity.level()).getChunkSource().removeEntity(nmsEntity); }