diff options
| author | Shane Freeder <[email protected]> | 2019-07-23 20:17:32 +0100 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2019-07-23 20:17:32 +0100 |
| commit | 48b6bfe2a636cba20778983cda4d20c78244873e (patch) | |
| tree | 3d4617962179491ab68dbc3e5749df2a7fd43689 /Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch | |
| parent | 396d3f13c4266baf91926061939211381647cfbb (diff) | |
| download | Paper-48b6bfe2a636cba20778983cda4d20c78244873e.tar.gz Paper-48b6bfe2a636cba20778983cda4d20c78244873e.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:
c987938a SPIGOT-5180: Add Villager#sleep() and #wakeup() methods
CraftBukkit Changes:
7f33c6a2 SPIGOT-5196: Restore previous version behaviour regarding cancelled BlockBreakEvent
6a5fc902 Improve diff in EntityHanging
c98d61bf SPIGOT-4712: Allow spawning of upwards or downwards facing item frames
db971477 SPIGOT-5199: Fix NPE if setting the book of the ItemMeta of a lectern
b0ef3996 SPIGOT-4679 Fix black lines after book paragraphs
1215188f SPIGOT-5180: Add Villager#sleep() and #wakeup() methods
c03b2bef SPIGOT-4975: NPE on WorldGenStronghold When Using Multiple Worlds
65ea162c Ensure Bukkit data pack is always up to date
0b107b8d MC-157395, SPIGOT-5193: Small armor stands do not drop loot
6da0abca SPIGOT-5195: Player loot table does not drop when keepInventory is on
8b09d983 SPIGOT-5190: Superfluous EntityCombustEvent called when using fire aspect sword
Spigot Changes:
1981d553 SPIGOT-5198: Catch more bad async operations
6a14ca46 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.patch | 12 |
1 files changed, 6 insertions, 6 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 f46563b790..81c592beb2 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 999afc724c832e02f43f5a53eb3d718fec26ca49 Mon Sep 17 00:00:00 2001 +From 3a06c1c75bebcf36bb3d8ea4553d07efb2eba026 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 @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e709b9123d..c16f2a9c16 100644 +index cec120cf2..7bb83014b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -157,7 +157,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -33,7 +33,7 @@ index e709b9123d..c16f2a9c16 100644 public final double[] recentTps = new double[ 3 ]; public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant(); // Spigot end -@@ -770,6 +770,57 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas +@@ -768,6 +768,57 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas { return ( avg * exp ) + ( tps * ( 1 - exp ) ); } @@ -91,7 +91,7 @@ index e709b9123d..c16f2a9c16 100644 // Spigot End public void run() { -@@ -782,30 +833,38 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas +@@ -780,30 +831,38 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas // Spigot start Arrays.fill( recentTps, 20 ); @@ -140,7 +140,7 @@ index e709b9123d..c16f2a9c16 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 01311668df..8cdaf4758d 100644 +index e72faeaa3..688ab8ccf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1928,6 +1928,17 @@ public final class CraftServer implements Server { @@ -162,7 +162,7 @@ index 01311668df..8cdaf4758d 100644 { diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java -index be2e31deae..6d21c32692 100644 +index be2e31dea..6d21c3269 100644 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java @@ -1,8 +1,5 @@ |