diff options
| author | Nassim Jahnke <[email protected]> | 2022-03-04 09:33:13 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2022-03-04 09:33:13 +0100 |
| commit | 719daa8bbf3848f11ed34937e5d8c2ae29117ea7 (patch) | |
| tree | 764dff0eb5be3e81cb00166a875cabcaf9b6ed27 /patches/server/0878-Fix-deadlock-on-watchdog-crash.patch | |
| parent | c09365aeac3afac0888eb835bdf54844544b574a (diff) | |
| download | Paper-719daa8bbf3848f11ed34937e5d8c2ae29117ea7.tar.gz Paper-719daa8bbf3848f11ed34937e5d8c2ae29117ea7.zip | |
Updated Upstream (CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
4ed5af5e SPIGOT-6956: Reduce differences caused by setKeepSpawnInMemory(false)
21fe78aa SPIGOT-6957: Bad default value for WorldCreator#generatorSettings
ce373be6 PR-1022: Fix get HighestBlockAt in chunk snapshot
Diffstat (limited to 'patches/server/0878-Fix-deadlock-on-watchdog-crash.patch')
| -rw-r--r-- | patches/server/0878-Fix-deadlock-on-watchdog-crash.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0878-Fix-deadlock-on-watchdog-crash.patch b/patches/server/0878-Fix-deadlock-on-watchdog-crash.patch index 995e8b01ac..7839535587 100644 --- a/patches/server/0878-Fix-deadlock-on-watchdog-crash.patch +++ b/patches/server/0878-Fix-deadlock-on-watchdog-crash.patch @@ -7,10 +7,10 @@ The watchdog thread sets MinecraftServer#forceTicks to true which will cause waitUntilNextTick to hang when the task queue is drained. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d86fa3bbdc6cc838ed0ab96c2c084386dd4593e9..46a959633a88ad146e8935d297ffddee2384e275 100644 +index 17e87875a95495940899b862eabf98b3d6a365da..07c382f30ed3736ed15b5b71f48dc4a1de958242 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1014,7 +1014,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa +@@ -1012,7 +1012,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa }, false); } |