9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-06 15:41:52 +00:00

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@4b57bed Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-10-21 21:00:44 +03:00
parent d7b31285ef
commit 5862dabc8c
29 changed files with 40 additions and 68 deletions

View File

@@ -1214,10 +1214,10 @@ index d3ec817e95628f1fc8be4a29c9a0f13c7d5fd552..e9798517b9211c50a20ea5c69603aab3
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 83a27e7bf9513eb5461cd30d1b7217128a2da268..0aaddf32ed87bd075c4bfe31be00086b73802f23 100644
index 5505c13d0e602f39fe02dde350082c11a2f2a2e0..eb945d9574377d8f30530504e1c92c7b3a6972ac 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -200,7 +200,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -202,7 +202,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
// Paper start
@Override
public void reportTimings() {
@@ -1226,7 +1226,7 @@ index 83a27e7bf9513eb5461cd30d1b7217128a2da268..0aaddf32ed87bd075c4bfe31be00086b
}
// Paper end
@@ -478,7 +478,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -484,7 +484,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
// Paper start
@Override
public String getTimingsServerName() {