fix protocol core & log command

LeavesMC · Aug 11, 2024 · d3c4426 · d3c4426
1 parent 1cbb6ed
commit d3c4426
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/patches/server/0053-Leaves-Protocol-core.patch b/patches/server/0053-Leaves-Protocol-core.patch
@@ -6,6 +6,19 @@ Subject: [PATCH] Leaves Protocol core
 This patch is Powered by Leaves(https://github.com/LeavesMC/Leaves)
 License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) (https://github.com/LeavesMC/Leaves?tab=License-1-ov-file)
 
+diff --git a/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaGlobalRegionScheduler.java b/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaGlobalRegionScheduler.java
+index d306f911757a4d556c82c0070d4837db87afc497..671616b35efe03bfa97b5f52abccdd47da06ef75 100644
+--- a/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaGlobalRegionScheduler.java
++++ b/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaGlobalRegionScheduler.java
+@@ -29,6 +29,8 @@ public class FoliaGlobalRegionScheduler implements GlobalRegionScheduler {
+             }
+         }
+
++        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
++
+         if (run == null) {
+             return;
+         }
 diff --git a/src/main/java/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java b/src/main/java/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
 index 0211311b3b63bcdea7ebf7bcb24629674c771402..c05a72f4928ee2cec28a61ed06a9079d52634900 100644
 --- a/src/main/java/net/minecraft/network/protocol/common/custom/CustomPacketPayload.java
@@ -35,19 +48,6 @@ index 0211311b3b63bcdea7ebf7bcb24629674c771402..c05a72f4928ee2cec28a61ed06a9079d
              }
          };
      }
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 418f2d2483bb1d79ef7da25539b42c5c73cd93b6..8056ddc2164789ac8efab4f5bf2069c4768f7657 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1881,6 +1881,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-
-         this.profiler.popPush("server gui refresh");
-
-+        org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
-+
-         if (region == null) for (int i = 0; i < this.tickables.size(); ++i) {  // Folia - region threading - TODO WTF is this?
-             ((Runnable) this.tickables.get(i)).run();
-         }
 diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 index 5224c4ca63d47cdf0adefc0254e15bf5a0fba2fc..bbb856fb9b4082d752a6761bb5196fffa48fbd6c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java

diff --git a/patches/server/0057-Implementation-Carpet-features.patch b/patches/server/0057-Implementation-Carpet-features.patch
@@ -182,7 +182,7 @@ index d5e8dd947cb29343074df8074e791357c72e7f7b..1bfb318630bb66c373b55719e0246658
          if (this.channel.eventLoop().inEventLoop()) {
              this.doSendPacket(packet, callbacks, flush);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8056ddc2164789ac8efab4f5bf2069c4768f7657..06e8fd7d5fda88ff4b4ba1112e8457b2c94727f7 100644
+index 418f2d2483bb1d79ef7da25539b42c5c73cd93b6..f5f41843c4e39eae001d31851d1946874166d0a0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -449,6 +449,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -6669,10 +6669,10 @@ index 0000000000000000000000000000000000000000..949eea4d3c29e0b2f7e90e1ea924f852
 +}
 diff --git a/src/main/java/org/leavesmc/lumina/carpet/logging/HUDController.java b/src/main/java/org/leavesmc/lumina/carpet/logging/HUDController.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ed0868bf1c8d976b738735ca4ebb4af4903e3b0e
+index 0000000000000000000000000000000000000000..91afc27c8edf64089a0a187f960dced748d98e6f
 --- /dev/null
 +++ b/src/main/java/org/leavesmc/lumina/carpet/logging/HUDController.java
-@@ -0,0 +1,154 @@
+@@ -0,0 +1,151 @@
 +package org.leavesmc.lumina.carpet.logging;
 +
 +import io.papermc.paper.threadedregions.*;
@@ -6767,11 +6767,8 @@ index 0000000000000000000000000000000000000000..ed0868bf1c8d976b738735ca4ebb4af4
 +        if (LoggerRegistry.__packets) {
 +            LoggerRegistry.getLogger("packets").log(HUDController::packetCounter);
 +        }
-+        for (ServerPlayer p : server.getPlayerList().getPlayers()) {
-+            System.out.println("Updating HUD for ");
-+            p.getBukkitEntity().getScheduler().run(CarpetServer.PLUGIN, e -> {
-+                final ServerPlayer player = (ServerPlayer) e;
-+                System.out.println("Updating HUD for " + player.getScoreboardName());
++        for (final ServerPlayer player : server.getPlayerList().getPlayers()) {
++            player.getBukkitEntity().getScheduler().run(CarpetServer.PLUGIN, task -> {
 +                String playerName = player.getScoreboardName();
 +                if (LoggerRegistry.__tps) {
 +                    final ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> currentRegion = TickRegionScheduler.getCurrentRegion();