From 27e94ec67bc06d2afd5428c0c7ed8e6122962e84 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 5 Aug 2014 13:44:19 -0500 Subject: [PATCH] Update from upstream SpigotMC Fix timings SpigotMC/Spigot@7d79f6bf5e6a214e61603a0f65987080cb3784c7 Fix the particle api using the wrong Material class SpigotMC/Spigot@f5a1e7a96f11107343c0f68398ffcb2cc51da139 --- CraftBukkit-Patches/0013-Spigot-Timings.patch | 27 ++++++++++--------- .../0055-Watchdog-Thread.patch | 10 +++---- CraftBukkit-Patches/0069-Particle-API.patch | 6 ++--- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/CraftBukkit-Patches/0013-Spigot-Timings.patch b/CraftBukkit-Patches/0013-Spigot-Timings.patch index 892ac6bb3d..7205013e30 100644 --- a/CraftBukkit-Patches/0013-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0013-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From bfdf21ee6ea67c741f19761246c2c1f43d1793f9 Mon Sep 17 00:00:00 2001 +From 549a301ccedf9ed4857d740d1b8a3e60783a7378 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -241,7 +241,7 @@ index 0c63b2c..6a0bee6 100644 this.world.methodProfiler.b(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 998de35..523f429 100644 +index 998de35..0a15416 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -37,6 +37,7 @@ import jline.console.ConsoleReader; @@ -273,7 +273,14 @@ index 998de35..523f429 100644 } this.methodProfiler.a("tallying"); -@@ -596,16 +600,23 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo +@@ -591,21 +595,30 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo + + this.methodProfiler.b(); + this.methodProfiler.b(); ++ SpigotTimings.serverTickTimer.stopTiming(); // Spigot ++ org.spigotmc.CustomTimingsHandler.tick(); // Spigot + } + public void v() { this.methodProfiler.a("levels"); @@ -297,7 +304,7 @@ index 998de35..523f429 100644 // Send time updates to everyone, it will get the right time from the world the player is in. if (this.ticks % 20 == 0) { for (int i = 0; i < this.getPlayerList().players.size(); ++i) { -@@ -613,6 +624,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo +@@ -613,6 +626,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time } } @@ -305,7 +312,7 @@ index 998de35..523f429 100644 int i; -@@ -638,7 +650,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo +@@ -638,7 +652,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo CrashReport crashreport; try { @@ -315,7 +322,7 @@ index 998de35..523f429 100644 } catch (Throwable throwable) { crashreport = CrashReport.a(throwable, "Exception ticking world"); worldserver.a(crashreport); -@@ -646,7 +660,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo +@@ -646,7 +662,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo } try { @@ -325,7 +332,7 @@ index 998de35..523f429 100644 } catch (Throwable throwable1) { crashreport = CrashReport.a(throwable1, "Exception ticking world entities"); worldserver.a(crashreport); -@@ -655,7 +671,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo +@@ -655,7 +673,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo this.methodProfiler.b(); this.methodProfiler.a("tracker"); @@ -335,7 +342,7 @@ index 998de35..523f429 100644 this.methodProfiler.b(); this.methodProfiler.b(); // } // CraftBukkit -@@ -664,16 +682,24 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo +@@ -664,14 +684,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo } this.methodProfiler.c("connection"); @@ -355,11 +362,7 @@ index 998de35..523f429 100644 + SpigotTimings.tickablesTimer.stopTiming(); // Spigot this.methodProfiler.b(); -+ SpigotTimings.serverTickTimer.stopTiming(); // Spigot -+ org.spigotmc.CustomTimingsHandler.tick(); // Spigot } - - public boolean getAllowNether() { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index c240020..9596da2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/CraftBukkit-Patches/0055-Watchdog-Thread.patch b/CraftBukkit-Patches/0055-Watchdog-Thread.patch index f23812e576..937c077890 100644 --- a/CraftBukkit-Patches/0055-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0055-Watchdog-Thread.patch @@ -1,11 +1,11 @@ -From 4fcc8840a648aae6573f9b59366b17922b1dcb7b Mon Sep 17 00:00:00 2001 +From b9bdcd6af0fa0b3be899af63b621527f95d2c5fe Mon Sep 17 00:00:00 2001 From: md_5 -Date: Sat, 23 Feb 2013 12:33:20 +1100 +Date: Tue, 5 Aug 2014 17:20:19 +0100 Subject: [PATCH] Watchdog Thread. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a9431be..256d2f9 100644 +index da69706..d596924 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -498,6 +498,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo @@ -16,10 +16,10 @@ index a9431be..256d2f9 100644 this.stop(); this.isStopped = true; } catch (Throwable throwable1) { -@@ -698,6 +699,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo - SpigotTimings.tickablesTimer.stopTiming(); // Spigot +@@ -595,6 +596,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo this.methodProfiler.b(); + this.methodProfiler.b(); + org.spigotmc.WatchdogThread.tick(); // Spigot SpigotTimings.serverTickTimer.stopTiming(); // Spigot org.spigotmc.CustomTimingsHandler.tick(); // Spigot diff --git a/CraftBukkit-Patches/0069-Particle-API.patch b/CraftBukkit-Patches/0069-Particle-API.patch index d06a8876d3..fe0ee2f269 100644 --- a/CraftBukkit-Patches/0069-Particle-API.patch +++ b/CraftBukkit-Patches/0069-Particle-API.patch @@ -1,4 +1,4 @@ -From a4abb2d1743ae072e9f93d480665c7c75f76eafc Mon Sep 17 00:00:00 2001 +From b3d80db144b04c9cfefed4610975d85afd7a4193 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -18,7 +18,7 @@ index 7de0de5..7eca388 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 28aa997..92c9851 100644 +index 28aa997..53a5d37 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -810,28 +810,18 @@ public class CraftWorld implements World { @@ -78,7 +78,7 @@ index 28aa997..92c9851 100644 + { + StringBuilder particleFullName = new StringBuilder(); + particleFullName.append( effect.getName() ); -+ if ( effect.getData() != null && ( effect.getData().equals( Material.class ) || effect.getData().equals( org.bukkit.material.MaterialData.class ) ) ) ++ if ( effect.getData() != null && ( effect.getData().equals( org.bukkit.Material.class ) || effect.getData().equals( org.bukkit.material.MaterialData.class ) ) ) + { + particleFullName.append( '_' ).append( id ); + }