aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0436-Improved-Watchdog-Support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0436-Improved-Watchdog-Support.patch')
-rw-r--r--Spigot-Server-Patches/0436-Improved-Watchdog-Support.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/Spigot-Server-Patches/0436-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0436-Improved-Watchdog-Support.patch
index 93119e26e2..65c525f689 100644
--- a/Spigot-Server-Patches/0436-Improved-Watchdog-Support.patch
+++ b/Spigot-Server-Patches/0436-Improved-Watchdog-Support.patch
@@ -83,7 +83,7 @@ index 397194b3e90c9df39cfae17b401c7ac891b0dbb7..61b4c42e95994343772a91640b243b8e
a(SystemUtils.e);
a(SystemUtils.f);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 795cf9635ab6ac7f001476354813cac9d7e025eb..6f51409bac9c2907a5be02e4c15319fcc520609f 100644
+index 506edef56ef6012424556f058996dbf690d4bae7..0498c62d695d627db26d8c932562f0e2cc7eec74 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -271,7 +271,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -287,7 +287,7 @@ index 5ccc70f36616e1bd8cdb8b23315f7422ec5acc61..b00c5a7eaf456e6d6ce250ee790ce33d
list.stream().map((playerchunk) -> {
CompletableFuture completablefuture;
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index cfe784560ea4c368d6e3a0797d09c0a717eb146e..795c4a9e3e33660af888ff80204bfd47a3b327fd 100644
+index bc629c8355a0a2273bcf1285a22deb1ce1154bf9..524bbf9bdf5fb0e1e4ff217ae3291fdbe742437e 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -177,7 +177,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -345,10 +345,10 @@ index cc41dcd85760b57bb8076b37e9a907d1cb4e12c7..efcfc8f0f45901d14ac8fdf8ed7b0bd6
String msg = "Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ();
System.err.println(msg);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fbc5d62d1ac2affc5240b114ee88375ff0199ef4..b55b2a27adba357faee0f260c8d7cc247d8d8238 100644
+index 9325b4f4f668ecd519d9c0106300d2b4c84bea63..d1eb8818e5d7bb43ef014392a9dd5bc83a34d71a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1841,7 +1841,7 @@ public final class CraftServer implements Server {
+@@ -1838,7 +1838,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@@ -358,7 +358,7 @@ index fbc5d62d1ac2affc5240b114ee88375ff0199ef4..b55b2a27adba357faee0f260c8d7cc24
// Paper start
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c3e2d9c4d0ef3de80f5206c6bd234121ee1316cc..777116a0a0be6a5a00b1443204d6c53803af8051 100644
+index a399c676c431c16468a55beb09a47ce0d5548769..f9edae56abff5f6b2e2f02dd52fd92feeda9f407 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -12,6 +12,8 @@ import java.util.logging.Level;