9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@1bbb033 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-05-24 02:40:24 +03:00
parent d80347acb9
commit e8eb99627c
2 changed files with 4 additions and 4 deletions

View File

@@ -2,7 +2,7 @@ group = space.bxteam.divinemc
mcVersion = 1.20.6
version = 1.20.6-R0.1-SNAPSHOT
purpurRef = ed1e0ec889ff251ee0b5946d52d21ab5cd96e468
purpurRef = 1bbb0334799623b7d50beb920f35bd5f591471d1
org.gradle.caching = true
org.gradle.parallel = true

View File

@@ -983,7 +983,7 @@ index a57ea225fb9951421d2026928c26f351d1b58cca..9fa1c5d6a8f313cd3d0f99131da60b64
private void logTickMethodTime(long tickStartTime) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 40091d6c8a99a72f433520b3a703fccffadc308f..b5a83c68be764479e80d6350b15f61a5f04cbffe 100644
index 66266f4eb3f7322afd743e15d384d3a617c7084d..06296e18d1edfda53ffa19d04f4d1b6d2cd84483 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -64,9 +64,6 @@ import org.apache.logging.log4j.Level;
@@ -1355,7 +1355,7 @@ 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 3daf674f1e0de3fdd89db5536cc1e34140a5abb8..110c5879d54c8251913ea9af571af27a1a7f5dc9 100644
index 777f1d11d9fb5af29ec895383902daf348eb528e..93839b8dc59dbf1c07f9195a4a984ced743b36ed 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -219,7 +219,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -1367,7 +1367,7 @@ index 3daf674f1e0de3fdd89db5536cc1e34140a5abb8..110c5879d54c8251913ea9af571af27a
}
// Paper end
@@ -506,7 +506,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -497,7 +497,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
// Paper start
@Override
public String getTimingsServerName() {