Override more connection send methods

CitizensDev · Oct 8, 2023 · 58234c4 · 58234c4
1 parent ba74dc8
commit 58234c4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -25,10 +25,18 @@ public boolean isConnected() {
         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
@@ -1298,9 +1298,6 @@ public void removeFromServerPlayerList(Player player) {
     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);
     }