Writing directly to the netty channel

Writing using the standard server methods causes it to only be flushed every tick. This change allows the client to update the map more than 20 times per seconds, as the content is flushed instantly.
TheJoCraftNET · Apr 6, 2023 · f629774 · f629774
1 parent dca319a
commit f629774
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,7 @@ allprojects {
     apply(plugin = "maven-publish")
 
     group = "de.pianoman911"
-    version = "1.4.2"
+    version = "1.4.3"
 
     repositories {
         maven("https://repo.papermc.io/repository/maven-public/")

diff --git a/platform-common/src/main/java/de/pianoman911/mapengine/common/platform/IPlatform.java b/platform-common/src/main/java/de/pianoman911/mapengine/common/platform/IPlatform.java
@@ -13,6 +13,8 @@ public interface IPlatform<T> {
 
     void sendPacket(Player player, PacketContainer<T> packet);
 
+    void flush(Player player);
+
     PacketContainer<T> createMapDataPacket(MapUpdateData data, boolean fullData, int mapId, MapCursorCollection cursors);
 
     PacketContainer<T> createMapEntitySpawnPacket(int entityId, BlockVector pos, BlockFace facing);

diff --git a/platform-paper-1.19.3/src/main/java/de/pianoman911/mapengine/common/Paper1193Platform.java b/platform-paper-1.19.3/src/main/java/de/pianoman911/mapengine/common/Paper1193Platform.java
@@ -68,7 +68,12 @@ public String getDisplayedName() {
 
     @Override
     public void sendPacket(Player player, PacketContainer<Packet<ClientGamePacketListener>> packet) {
-        ((CraftPlayer) player).getHandle().connection.send(packet.getPacket());
+         ((CraftPlayer) player).getHandle().connection.connection.channel.write(packet.getPacket());
+    }
+
+    @Override
+    public void flush(Player player) {
+        ((CraftPlayer) player).getHandle().connection.connection.channel.flush();
     }
 
     @SuppressWarnings("deprecation") // magic values

diff --git a/platform-paper-1.19.4/src/main/java/de/pianoman911/mapengine/common/Paper1194Platform.java b/platform-paper-1.19.4/src/main/java/de/pianoman911/mapengine/common/Paper1194Platform.java
@@ -68,7 +68,12 @@ public String getDisplayedName() {
 
     @Override
     public void sendPacket(Player player, PacketContainer<Packet<ClientGamePacketListener>> packet) {
-        ((CraftPlayer) player).getHandle().connection.send(packet.getPacket());
+        ((CraftPlayer) player).getHandle().connection.connection.channel.write(packet.getPacket());
+    }
+
+    @Override
+    public void flush(Player player) {
+        ((CraftPlayer) player).getHandle().connection.connection.channel.flush();
     }
 
     @SuppressWarnings("deprecation") // magic values

diff --git a/plugin/src/main/java/de/pianoman911/mapengine/core/clientside/FrameContainer.java b/plugin/src/main/java/de/pianoman911/mapengine/core/clientside/FrameContainer.java
@@ -116,6 +116,7 @@ public void spawn(Player player) {
             frame.spawnPacket().send(player);
             frame.setIdPacket(0, false).send(player);
         }
+        plugin.platform().flush(player);
     }
 
     @Override
@@ -125,14 +126,15 @@ public void despawn(Player player) {
             ids.add(frame.entityId);
         }
         plugin.platform().createRemoveEntitiesPacket(ids).send(player);
+        plugin.platform().flush(player);
     }
 
     @Override
     public void mapId(Player player, int z) {
         for (Frame frame : frames) {
             frame.setIdPacket(z, true).send(player);
         }
-
+        plugin.platform().flush(player);
     }
 
     @Override
@@ -143,6 +145,7 @@ public void update(Player player, IMapUpdateData[] data, boolean fullData, int z
             }
             frames[i].updatePacket((MapUpdateData) data[i], fullData, z, cursors).send(player);
         }
+        plugin.platform().flush(player);
     }
 
     @Override