fixes lag issue on proxy

MineTrax · Jun 24, 2024 · 99037df · 99037df
1 parent 81df846
commit 99037df
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 49 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ plugins {
 allprojects {
     group = 'com.xinecraft'
     description = 'Minetrax'
-    version = '6.0.2'
+    version = '6.2.0'
 
     repositories {
         mavenLocal()

diff --git a/bukkit/src/main/java/com/xinecraft/minetrax/bukkit/MinetraxBukkit.java b/bukkit/src/main/java/com/xinecraft/minetrax/bukkit/MinetraxBukkit.java
@@ -163,7 +163,6 @@ public void onEnable() {
         Objects.requireNonNull(getCommand("ww")).setExecutor(new PlayerWhoisCommand());
 
         // Register Listeners
-        getServer().getPluginManager().registerEvents(new PlayerAdvancementDoneListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerChatListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerDeathListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerJoinLeaveListener(), this);

diff --git a/.../src/main/java/com/xinecraft/minetrax/bukkit/listeners/PlayerAdvancementDoneListener.java b/.../src/main/java/com/xinecraft/minetrax/bukkit/listeners/PlayerAdvancementDoneListener.java
diff --git a/bungee/src/main/java/com/xinecraft/minetrax/bungee/listeners/ServerConnectedListener.java b/bungee/src/main/java/com/xinecraft/minetrax/bungee/listeners/ServerConnectedListener.java
@@ -20,22 +20,20 @@ public void sendUpdateSkinMessageOnServerConnected(ServerConnectedEvent event) {
         }
 
         ProxiedPlayer player = event.getPlayer();
-        SkinProperty skinProperty = SkinUtil.getSkinForPlayer(player.getUniqueId(), player.getName());
+        MinetraxBungee.getPlugin().getProxy().getScheduler().runAsync(MinetraxBungee.getPlugin(), () -> {
+            SkinProperty skinProperty = SkinUtil.getSkinForPlayer(player.getUniqueId(), player.getName());
+            if (skinProperty != null) {
+                String skinPropertyJson = MinetraxBungee.getPlugin().getGson().toJson(skinProperty);
+                String skinTextureId = PropertyUtils.getSkinTextureUrlStripped(skinProperty);
+                String playerUuid = player.getUniqueId().toString();
 
-        if (skinProperty != null) {
-            String skinPropertyJson = MinetraxBungee.getPlugin().getGson().toJson(skinProperty);
-            String skinTextureId = PropertyUtils.getSkinTextureUrlStripped(skinProperty);
-            String playerUuid = player.getUniqueId().toString();
-
-            ByteArrayDataOutput out = ByteStreams.newDataOutput();
-            out.writeUTF("UpdatePlayerSkin");
-            out.writeUTF(playerUuid);
-            out.writeUTF(skinPropertyJson);
-            out.writeUTF(skinTextureId);
-
-            MinetraxBungee.getPlugin().getProxy().getScheduler().runAsync(MinetraxBungee.getPlugin(), () -> {
+                ByteArrayDataOutput out = ByteStreams.newDataOutput();
+                out.writeUTF("UpdatePlayerSkin");
+                out.writeUTF(playerUuid);
+                out.writeUTF(skinPropertyJson);
+                out.writeUTF(skinTextureId);
                 event.getServer().sendData(MinetraxCommon.PLUGIN_MESSAGE_CHANNEL, out.toByteArray());
-            });
-        }
+            }
+        });
     }
 }
diff --git a/...city/src/main/java/com/xinecraft/minetrax/velocity/listeners/ServerConnectedListener.java b/...city/src/main/java/com/xinecraft/minetrax/velocity/listeners/ServerConnectedListener.java
@@ -20,23 +20,20 @@ public void sendUpdateSkinMessageOnServerConnected(ServerConnectedEvent event) {
 
         Player player = event.getPlayer();
         RegisteredServer server = event.getServer();
-        SkinProperty skinProperty = SkinUtil.getSkinForPlayer(player.getUniqueId(), player.getUsername());
+        MinetraxVelocity.getPlugin().getProxyServer().getScheduler().buildTask(MinetraxVelocity.getPlugin(), () -> {
+            SkinProperty skinProperty = SkinUtil.getSkinForPlayer(player.getUniqueId(), player.getUsername());
+            if (skinProperty != null) {
+                String skinPropertyJson = MinetraxVelocity.getPlugin().getGson().toJson(skinProperty);
+                String skinTextureId = PropertyUtils.getSkinTextureUrlStripped(skinProperty);
+                String playerUuid = player.getUniqueId().toString();
 
-        if (skinProperty != null) {
-            String skinPropertyJson = MinetraxVelocity.getPlugin().getGson().toJson(skinProperty);
-            String skinTextureId = PropertyUtils.getSkinTextureUrlStripped(skinProperty);
-            String playerUuid = player.getUniqueId().toString();
-
-            ByteArrayDataOutput out = ByteStreams.newDataOutput();
-            out.writeUTF("UpdatePlayerSkin");
-            out.writeUTF(playerUuid);
-            out.writeUTF(skinPropertyJson);
-            out.writeUTF(skinTextureId);
-
-            // Run after 1 seconds as plugin message channel is not ready yet.
-            MinetraxVelocity.getPlugin().getProxyServer().getScheduler().buildTask(MinetraxVelocity.getPlugin(), () -> {
+                ByteArrayDataOutput out = ByteStreams.newDataOutput();
+                out.writeUTF("UpdatePlayerSkin");
+                out.writeUTF(playerUuid);
+                out.writeUTF(skinPropertyJson);
+                out.writeUTF(skinTextureId);
                 server.sendPluginMessage(MinetraxVelocity.PLUGIN_MESSAGE_CHANNEL, out.toByteArray());
-            }).delay(1, java.util.concurrent.TimeUnit.SECONDS).schedule();
-        }
+            }
+        }).delay(1, java.util.concurrent.TimeUnit.SECONDS).schedule();  // Run after 1 seconds as plugin message channel is not ready yet.
     }
 }