Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2026-01-06 15:41:52 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@45774b4 apply the rest of the unapplied patches
PurpurMC/Purpur@dd826a3 Updated Upstream (Paper)
PurpurMC/Purpur@778995d Updated Upstream (Paper)
PurpurMC/Purpur@9ff84cb Updated Upstream (Paper)
PurpurMC/Purpur@bd49055 [ci skip] replace paper with purpur in log message
PurpurMC/Purpur@a122fd7 Updated Upstream (Paper)
PurpurMC/Purpur@783acfe Updated Upstream (Paper)
PurpurMC/Purpur@b5f1c48 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2024-06-21 04:21:18 +03:00
parent bbda4e170e
commit e61de52a5c
6 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0029-Delete-Timings.patch
View File

@@ -826,7 +826,7 @@ index 0c8fe5b2500480c3a9e9ab3285ad22e0e599d953..f7197f1347251a37dd0f6d9ffa2f09bc
} catch (Exception exception) {
if (exception instanceof ReportedException) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 40a4273275822a8b3013807a9dd0716a0c93eaf0..2593d6c62ef8f45d35437cbfdfc938c4fbb4bbaf 100644
index 6699b0dadaf7ac49f8c7ec6605bb64472b52361e..3df813c086c2a8dfc29c08cb884c099ee698f412 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -3,7 +3,6 @@ package net.minecraft.server;
@@ -846,7 +846,7 @@ index 40a4273275822a8b3013807a9dd0716a0c93eaf0..2593d6c62ef8f45d35437cbfdfc938c4
public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer { // Paper - rewrite chunk system
private static MinecraftServer SERVER; // Paper
@@ -968,7 +965,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -985,7 +982,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -854,7 +854,7 @@ index 40a4273275822a8b3013807a9dd0716a0c93eaf0..2593d6c62ef8f45d35437cbfdfc938c4
// Purpur start
if (upnp) {
if (dev.omega24.upnp4j.UPnP4J.close(this.getPort(), dev.omega24.upnp4j.util.Protocol.TCP)) {
@@ -1504,15 +1500,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1556,15 +1552,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -872,7 +872,7 @@ index 40a4273275822a8b3013807a9dd0716a0c93eaf0..2593d6c62ef8f45d35437cbfdfc938c4
// Paper end
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
@@ -1537,9 +1532,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1589,9 +1584,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
io.papermc.paper.util.CachedLists.reset(); // Paper
// Paper start - move executeAll() into full server tick timing
@@ -883,7 +883,7 @@ index 40a4273275822a8b3013807a9dd0716a0c93eaf0..2593d6c62ef8f45d35437cbfdfc938c4
// Paper end
// Paper start - Server Tick Events
long endTime = System.nanoTime();
@@ -1562,7 +1555,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1614,7 +1607,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.logTickMethodTime(i);
//this.profiler.pop(); // Purpur
org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -892,7 +892,7 @@ index 40a4273275822a8b3013807a9dd0716a0c93eaf0..2593d6c62ef8f45d35437cbfdfc938c4
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 d11f052f5432b75f25aefd967ebff936a72df4e1..5961b224aa0cb95f7e0a3838dfd6be91f12cd9fa 100644
index 386fe1aca665e745babe3ca24f393fcaee36c663..25e05b03892cf1f8844cc2111348787d137ede1f 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -66,9 +66,6 @@ import org.apache.logging.log4j.Level;
@@ -905,7 +905,7 @@ index d11f052f5432b75f25aefd967ebff936a72df4e1..5961b224aa0cb95f7e0a3838dfd6be91
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.craftbukkit.util.Waitable; // Paper
import org.bukkit.event.server.RemoteServerCommandEvent;
@@ -819,21 +816,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -846,21 +843,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
// Paper start
command.set(event.getCommand());
@@ -928,7 +928,7 @@ index d11f052f5432b75f25aefd967ebff936a72df4e1..5961b224aa0cb95f7e0a3838dfd6be91
// Paper start
if (waitableArray[0] != null) {
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index da56e8d58f8b0391689f697807a4873fc759a26b..323c4d36b21e2312b626870df69748cd3fff13bf 100644
index f5dd325b755beefa159957864ef0d3a381b3af86..f619a698126d60261754e384e523883067a69395 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1,6 +1,5 @@
@@ -939,7 +939,7 @@ index da56e8d58f8b0391689f697807a4873fc759a26b..323c4d36b21e2312b626870df69748cd
import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.Iterables;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 500a735113f9f16f9d336c2bb1cad1447e5d64c4..d4a4905372a06011a60e0b1a400e41902576ce7b 100644
index fa652c9cea66b31c2452ed77cf251791d22f06fb..b38ad3a617b333b2e28981d95deed16f487112c1 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1,7 +1,6 @@
@@ -970,7 +970,7 @@ index 500a735113f9f16f9d336c2bb1cad1447e5d64c4..d4a4905372a06011a60e0b1a400e4190
entity.postTick(); // CraftBukkit
} else { entity.inactiveTick(); } // Paper - EAR 2
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 51cb32a67f81422fd59ef072633c3de523ff7405..df0471ca95bec71c9682e382d4c9bb7c91d14ed5 100644
index 10c59d30da3c4713fb7cdcf2e600508c0dd3acf0..969a5461316401950c8fba6ed6347164235a5af9 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1,6 +1,5 @@
@@ -1062,7 +1062,7 @@ index 09a7b418ddf564c0be13297f7c216db2e7ae1578..1e26b1099139d76e49fce14ee72061e1
this.scanRate = senseInterval;
this.timeToTick = (long)RANDOM.nextInt(senseInterval);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 975cd21cfe3199a3cf29439443c85d3f4ac5140e..6cd892728effd3454df6799c34fb8820c980934d 100644
index 20d9b85fdf6bcf570c97c9bbf9787918d81cc9be..37f63cb756030f41f3d6f535469c0c6b8cc862cb 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -175,7 +175,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -1081,7 +1081,7 @@ index 975cd21cfe3199a3cf29439443c85d3f4ac5140e..6cd892728effd3454df6799c34fb8820
this.entityLookup = new ca.spottedleaf.moonrise.patches.chunk_system.level.entity.dfl.DefaultEntityLookup(this); // Paper - rewrite chunk system
this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
}
@@ -1018,9 +1016,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -1016,9 +1014,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
}
this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075
@@ -1223,7 +1223,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 dcf90f04aec8e703d34357db569141aa3ccae35a..ff5cf90fe4ff572aa4ee3b4abc97d93828737fe4 100644
index aa38e21c30ae104e0f775bd29da4a49366d009f8..9a58c155ba65e905e85b0df02fb5c29b3a26f670 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -220,7 +220,7 @@ public final class CraftMagicNumbers implements UnsafeValues {