fix unregister channel issue and 1.20.2 packet listener

hakan-krgn · Oct 18, 2023 · dcfc1a8 · dcfc1a8
1 parent 56c1975
commit dcfc1a8
Show file tree

Hide file tree

Showing 23 changed files with 41 additions and 24 deletions.
diff --git a/hCore-bukkit/api/src/main/java/com/hakan/core/utils/ReflectionUtils.java b/hCore-bukkit/api/src/main/java/com/hakan/core/utils/ReflectionUtils.java
@@ -69,11 +69,26 @@ public static <T> T newInstance(@Nonnull String path,
     @Nullable
     public static <T> T getField(@Nonnull Object object,
                                  @Nonnull String fieldName) {
+        return getField(object, object.getClass(), fieldName);
+    }
+
+    /**
+     * Gets value of the given field.
+     *
+     * @param object    Object.
+     * @param fieldName Field name.
+     * @param <T>       Type of field.
+     * @return Value of the given field.
+     */
+    @Nullable
+    public static <T> T getField(@Nonnull Object object,
+                                 @Nonnull Class<?> clazz,
+                                 @Nonnull String fieldName) {
         try {
             Validate.notNull(object, "object cannot be null!");
             Validate.notNull(fieldName, "fieldName cannot be null!");
 
-            Field field = object.getClass().getDeclaredField(fieldName);
+            Field field = clazz.getDeclaredField(fieldName);
             field.setAccessible(true);
             Object value = field.get(object);
             field.setAccessible(false);

diff --git a/...bukkit/nms/v1_10_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_10_R1.java b/...bukkit/nms/v1_10_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_10_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_11_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_11_R1.java b/...bukkit/nms/v1_11_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_11_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_12_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_12_R1.java b/...bukkit/nms/v1_12_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_12_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_13_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_13_R1.java b/...bukkit/nms/v1_13_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_13_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_13_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_13_R2.java b/...bukkit/nms/v1_13_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_13_R2.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_14_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_14_R1.java b/...bukkit/nms/v1_14_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_14_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_15_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_15_R1.java b/...bukkit/nms/v1_15_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_15_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_16_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_16_R1.java b/...bukkit/nms/v1_16_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_16_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_16_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_16_R2.java b/...bukkit/nms/v1_16_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_16_R2.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_16_R3/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_16_R3.java b/...bukkit/nms/v1_16_R3/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_16_R3.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_17_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_17_R1.java b/...bukkit/nms/v1_17_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_17_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_18_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_18_R1.java b/...bukkit/nms/v1_18_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_18_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_18_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_18_R2.java b/...bukkit/nms/v1_18_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_18_R2.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...it/nms/v1_19_1_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_19_1_R1.java b/...it/nms/v1_19_1_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_19_1_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_19_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_19_R1.java b/...bukkit/nms/v1_19_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_19_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_19_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_19_R2.java b/...bukkit/nms/v1_19_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_19_R2.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_19_R3/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_19_R3.java b/...bukkit/nms/v1_19_R3/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_19_R3.java
@@ -81,6 +81,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_20_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_20_R1.java b/...bukkit/nms/v1_20_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_20_R1.java
@@ -81,6 +81,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...bukkit/nms/v1_20_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_20_R2.java b/...bukkit/nms/v1_20_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_20_R2.java
@@ -10,6 +10,7 @@
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.server.network.PlayerConnection;
+import net.minecraft.server.network.ServerCommonPacketListenerImpl;
 import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
@@ -49,7 +50,8 @@ public void send(@Nonnull Object... packets) {
     @Override
     public void register() {
         try {
-            NetworkManager networkManager = ReflectionUtils.getField(this.connection, "h");
+            NetworkManager networkManager = ReflectionUtils.getField(
+                    this.connection, ServerCommonPacketListenerImpl.class, "c");
             if (networkManager == null) return;
 
             super.pipeline = networkManager.n.pipeline().addBefore("packet_handler", CHANNEL + super.player.getUniqueId(), new ChannelDuplexHandler() {
@@ -81,6 +83,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...e-bukkit/nms/v1_8_R3/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_8_R3.java b/...e-bukkit/nms/v1_8_R3/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_8_R3.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...e-bukkit/nms/v1_9_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_9_R1.java b/...e-bukkit/nms/v1_9_R1/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_9_R1.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }
diff --git a/...e-bukkit/nms/v1_9_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_9_R2.java b/...e-bukkit/nms/v1_9_R2/src/main/java/com/hakan/core/packet/player/PacketPlayer_v1_9_R2.java
@@ -76,6 +76,6 @@ public void write(ChannelHandlerContext channelHandlerContext, Object o, Channel
     @Override
     public void unregister() {
         if (super.pipeline != null && super.pipeline.get(CHANNEL) != null)
-            super.pipeline.remove(CHANNEL);
+            super.pipeline.remove(CHANNEL + super.player.getUniqueId());
     }
 }