From 048aee04d3e5cf4669aa950e6a5b1ded54d77f5b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jul 2015 19:59:20 +1000 Subject: [PATCH] Rebuild patches for updates. --- .../0008-Merge-tweaks-and-configuration.patch | 2 ++ CraftBukkit-Patches/0011-Spigot-Timings.patch | 10 +++++----- CraftBukkit-Patches/0048-Watchdog-Thread.patch | 4 +--- .../0057-Configurable-Amount-of-Netty-Threads.patch | 4 +--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch index a95ee34689..d9015ca57a 100644 --- a/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch @@ -25,12 +25,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) { return false; } else { +- if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemMergeEvent(this, entityitem).isCancelled()) return false; // CraftBukkit - itemstack1.count += itemstack.count; - entityitem.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay); - entityitem.age = Math.min(entityitem.age, this.age); - entityitem.setItemStack(itemstack1); - this.die(); + // Spigot start ++ if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemMergeEvent(entityitem, this).isCancelled()) return false; // CraftBukkit + itemstack.count += itemstack1.count; + this.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay); + this.age = Math.min(entityitem.age, this.age); diff --git a/CraftBukkit-Patches/0011-Spigot-Timings.patch b/CraftBukkit-Patches/0011-Spigot-Timings.patch index 1783e5e993..8126b48713 100644 --- a/CraftBukkit-Patches/0011-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0011-Spigot-Timings.patch @@ -245,14 +245,14 @@ diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/ index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -0,0 +0,0 @@ import joptsimple.OptionSet; +@@ -0,0 +0,0 @@ import jline.console.ConsoleReader; + import joptsimple.OptionSet; import org.bukkit.craftbukkit.Main; - import org.bukkit.World.Environment; +import org.bukkit.craftbukkit.SpigotTimings; // Spigot - import org.bukkit.craftbukkit.util.Waitable; - import org.bukkit.event.server.RemoteServerCommandEvent; - import org.bukkit.event.world.WorldSaveEvent; + // CraftBukkit end + + public abstract class MinecraftServer implements Runnable, ICommandListener, IAsyncTaskHandler, IMojangStatistics { @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs protected void z() {} diff --git a/CraftBukkit-Patches/0048-Watchdog-Thread.patch b/CraftBukkit-Patches/0048-Watchdog-Thread.patch index a5fff434b1..0f3eabe4de 100644 --- a/CraftBukkit-Patches/0048-Watchdog-Thread.patch +++ b/CraftBukkit-Patches/0048-Watchdog-Thread.patch @@ -313,6 +313,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + } +} --- -1.9.0.msysgit.0 - +-- \ No newline at end of file diff --git a/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch b/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch index 475c58ae18..8b588e2d3d 100644 --- a/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch +++ b/CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch @@ -52,6 +52,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count ); + } } --- -1.9.0.msysgit.0 - +-- \ No newline at end of file