9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-30 03:59:08 +00:00

Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5c82955 Only mark decorations dirty if a removal actually occurs (#11413)
PaperMC/Paper@c5a1066 Remove wall-time / unused skip tick protection (#11412)
This commit is contained in:
Dreeam
2024-09-20 22:03:04 -04:00
parent 0f8447745c
commit 3a10fbfb0d
8 changed files with 41 additions and 41 deletions

View File

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b01b536b41913dd78ef752a5fbce399461c97a00..f4dd63ae1a9715f3cd10949ca49a269897443e56 100644
index 5b347162c668dd97f1b601d93318efa7abeb03e2..f39c51ae8ea689cb089cd9d4195276c2cfdaf1b7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -191,6 +191,8 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -19,7 +19,7 @@ index b01b536b41913dd78ef752a5fbce399461c97a00..f4dd63ae1a9715f3cd10949ca49a2698
private static MinecraftServer SERVER; // Paper
public static final Logger LOGGER = LogUtils.getLogger();
public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
@@ -325,6 +327,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -324,6 +326,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
S s0 = serverFactory.apply(thread); // CraftBukkit - decompile error
atomicreference.set(s0);