aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2020-03-10 11:01:15 +0000
committerShane Freeder <[email protected]>2020-03-10 11:01:21 +0000
commitb16fd5c3a3067e2d0f1f7163b20a07f66e50bc7b (patch)
treeca089dcd7bd5b8c96934f7e72f3e8f905a642d81 /Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
parent2e44dc1ae37a11946203bf04185865c924acf1b9 (diff)
downloadPaper-b16fd5c3a3067e2d0f1f7163b20a07f66e50bc7b.tar.gz
Paper-b16fd5c3a3067e2d0f1f7163b20a07f66e50bc7b.zip
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 6148fca7 SPIGOT-5484: Add more spawn tick settings CraftBukkit Changes: fc249340 SPIGOT-5484: Add more spawn tick settings Spigot Changes: 6de3d4be Rebuild patches
Diffstat (limited to 'Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch')
-rw-r--r--Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
index 91edc61afc..505b33410e 100644
--- a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
@@ -1,4 +1,4 @@
-From a4b1083f69dd3c49e34f3c05d70e300f1dcc451c Mon Sep 17 00:00:00 2001
+From 681bdfdef2c555527c463424e57dc22a563177d1 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Tue, 1 Mar 2016 23:09:29 -0600
Subject: [PATCH] Further improve server tick loop
@@ -140,10 +140,10 @@ index 2b3844ae5..7b8c523e6 100644
if (this.T) {
this.T = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 03ad9e005..88bd1ff20 100644
+index 99a6b3d44..e3939387e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1948,6 +1948,17 @@ public final class CraftServer implements Server {
+@@ -1970,6 +1970,17 @@ public final class CraftServer implements Server {
return CraftMagicNumbers.INSTANCE;
}