Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
6ada26a6d [Auto] Updated Upstream (Spigot)
f645e8d08 [Auto] Updated Upstream (Bukkit)
ac69804c7 Updated Upstream (Bukkit/Spigot) (#5048)
b109eef0d [CI-SKIP] [Auto] Rebuild Patches
9110bb8ee Fix villager boat exploit (#5047)
This commit is contained in:
BillyGalbreath
2021-01-12 19:55:19 -06:00
parent 885092f773
commit 8bfb9f5c19
7 changed files with 11 additions and 37 deletions

View File

@@ -16738,10 +16738,10 @@ index 9f7d2ef932ab41cef5d3d0736d20a7c7e4a2c888..51e9c54cddf4b28ba3d3d892322c4877
}
}
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index 513c1041c34ebb3ac1775674a3f4526693759c08..4d310908489953d6d061b2358f614142edacb62e 100644
index ae8903ee1decd22e2ad6138f29fbc757b807e0a7..58d01c6f8abcd9e1792495abd08b186f9d03f834 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -61,6 +61,84 @@ public class WatchdogThread extends Thread
@@ -65,6 +65,84 @@ public class WatchdogThread extends Thread
}
}
@@ -16826,7 +16826,7 @@ index 513c1041c34ebb3ac1775674a3f4526693759c08..4d310908489953d6d061b2358f614142
@Override
public void run()
{
@@ -117,6 +195,7 @@ public class WatchdogThread extends Thread
@@ -121,6 +199,7 @@ public class WatchdogThread extends Thread
log.log( Level.SEVERE, "------------------------------" );
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
ChunkTaskManager.dumpAllChunkLoadInfo(); // Paper