Remove some CraftBukkit pull requests that don't have any functional benefit at the moment.

2024-11-29 19:52:55 +01:00 · 2013-06-21 16:49:33 +10:00 · 2013-06-21 16:49:33 +10:00 · d98522c69d
commit d98522c69d
parent c3faaa3d24
35 changed files with 64 additions and 197 deletions
--- a/CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch
+++ b/CraftBukkit-Patches/0010-Merge-tweaks-and-configuration.patch
@ -1,4 +1,4 @@
-From 09bfa8a119a405550b9519bd84f11e3ae0f70f6b Mon Sep 17 00:00:00 2001
+From 9ce8fe366d6c6f3fb6d9f358782bd67f7286f869 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@ -69,10 +69,10 @@ index afe3e4d..d7e5301 100644
         if (event != null && (event.isCancelled() || entity.dead)) {
             entity.dead = true;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 18278c6..4c16ed7 100644
+index 8954c99..799bbc8 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -114,4 +114,18 @@ public class SpigotWorldConfig
+@@ -93,4 +93,18 @@ public class SpigotWorldConfig
         wheatModifier = getInt( "growth.wheat-modifier", wheatModifier );
         log( "Cactus Growth Modifier: " + cactusModifier + "%" );
     }
--- a/CraftBukkit-Patches/0013-View-Distance.patch
+++ b/CraftBukkit-Patches/0013-View-Distance.patch
@ -1,4 +1,4 @@
-From 98da2b7084a875327ad23ed8a913bf02e0e36fb6 Mon Sep 17 00:00:00 2001
+From 16ce161417a943918e27f36561a1f611e2cc9f78 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:52:41 +1100
 Subject: [PATCH] View Distance
@ -32,10 +32,10 @@ index 6c3fcf1..614a17f 100644
             this.entitiesById = new IntHashMap();
         }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 4c16ed7..de5d17e 100644
+index 799bbc8..0e3f855 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -128,4 +128,11 @@ public class SpigotWorldConfig
+@@ -107,4 +107,11 @@ public class SpigotWorldConfig
         expMerge = getFloat( "merge-radius.exp", expMerge );
         log( "Experience Merge Radius: " + expMerge );
     }
--- a/CraftBukkit-Patches/0018-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0018-Improved-Timings-System.patch
@ -1,4 +1,4 @@
-From 48b529e33646533eb0028189bf7836e56423e991 Mon Sep 17 00:00:00 2001
+From 6a85506600fad57b57f604edc72a6ef581d12845 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Improved Timings System
@ -213,10 +213,10 @@ index 3c80340..db396b3 100644
         this.methodProfiler.b();
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 52fa75a..93082ff 100644
+index 018c314..8deba1b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -968,6 +968,7 @@ public class PlayerConnection extends Connection {
+@@ -956,6 +956,7 @@ public class PlayerConnection extends Connection {
     // CraftBukkit end
 
     private void handleCommand(String s) {
@ -224,7 +224,7 @@ index 52fa75a..93082ff 100644
         // CraftBukkit start
         CraftPlayer player = this.getPlayer();
 
-@@ -975,19 +976,23 @@ public class PlayerConnection extends Connection {
+@@ -963,19 +964,23 @@ public class PlayerConnection extends Connection {
         this.server.getPluginManager().callEvent(event);
 
         if (event.isCancelled()) {
@ -233,7 +233,7 @@ index 52fa75a..93082ff 100644
         }
 
         try {
-             if (org.spigotmc.SpigotConfig.logCommands) this.minecraftServer.getLogger().info(event.getPlayer().getName() + " issued server command: " + event.getMessage()); // Spigot
+             this.minecraftServer.getLogger().info(event.getPlayer().getName() + " issued server command: " + event.getMessage()); // CraftBukkit
             if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
 +                org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
                 return;
--- a/CraftBukkit-Patches/0019-Orebfuscator.patch
+++ b/CraftBukkit-Patches/0019-Orebfuscator.patch
@ -1,4 +1,4 @@
-From c50921dc69979fb97674486de51a073d19273170 Mon Sep 17 00:00:00 2001
+From 845b5bc50a2e34500f94692cd0cb1a324b3ae329 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@ -316,7 +316,7 @@ index 0000000..74ee741
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index de5d17e..2f514a0 100644
+index 0e3f855..52e060a 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -1,5 +1,6 @@
@ -326,7 +326,7 @@ index de5d17e..2f514a0 100644
 import java.util.List;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
-@@ -135,4 +136,25 @@ public class SpigotWorldConfig
+@@ -114,4 +115,25 @@ public class SpigotWorldConfig
         viewDistance = getInt( "view-distance", Bukkit.getViewDistance() );
         log( "View Distance: " + viewDistance );
     }
--- a/CraftBukkit-Patches/0022-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0022-Entity-Activation-Range.patch
@ -1,4 +1,4 @@
-From 118a860a1790b95d1992033d9735aaa8c3e405af Mon Sep 17 00:00:00 2001
+From 54acbfac602e85d68bada6c0815e58fd77c3ed98 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@ -462,10 +462,10 @@ index 0000000..93ce20e
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 2f514a0..2824b17 100644
+index 52e060a..27323a0 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -157,4 +157,15 @@ public class SpigotWorldConfig
+@@ -136,4 +136,15 @@ public class SpigotWorldConfig
         
         antiXrayInstance = new AntiXray( this );
     }
--- a/CraftBukkit-Patches/0025-Netty.patch
+++ b/CraftBukkit-Patches/0025-Netty.patch
@ -1,4 +1,4 @@
-From da93c0bd48b4e34c4561ba975e7561cf60be9ef0 Mon Sep 17 00:00:00 2001
+From bfb9a7a900a658c78665a0397cd79789ad535056 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:47:32 +1000
 Subject: [PATCH] Netty
@ -210,10 +210,10 @@ index 17cfacc..a945892 100644
             this.b = true;
         } catch (Exception exception) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2567bde..7f5f3ea 100644
+index 6cb50b7..20ba4b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1367,4 +1367,20 @@ public final class CraftServer implements Server {
+@@ -1366,4 +1366,20 @@ public final class CraftServer implements Server {
     public CraftScoreboardManager getScoreboardManager() {
         return scoreboardManager;
     }
--- a/CraftBukkit-Patches/0026-PlayerItemDamageEvent.patch
+++ b/CraftBukkit-Patches/0026-PlayerItemDamageEvent.patch
@ -1,4 +1,4 @@
-From d0c3da40bb7be3c11ed8bfc098549dc5e3ddb97d Mon Sep 17 00:00:00 2001
+From f52dba2bbbe1ac2d868fc37d95d8a33e4e17a46e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 4 Mar 2013 18:45:52 +1100
 Subject: [PATCH] PlayerItemDamageEvent
--- a/CraftBukkit-Patches/0026-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
+++ b/CraftBukkit-Patches/0026-Return-bed-location-itself-instead-of-next-to-bed-Fi.patch
@ -1,45 +0,0 @@
-From 22c7f9a277249291f162a01327fad44bf3d3cbd1 Mon Sep 17 00:00:00 2001
-From: EdGruberman <ed@rjump.com>
-Date: Fri, 22 Feb 2013 09:23:51 -0700
-Subject: [PATCH] Return bed location itself instead of next to bed; Fixes
- BUKKIT-3604
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7cae665..8ec84e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -628,10 +628,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         ChunkCoordinates bed = getHandle().getBed();
- 
-         if (world != null && bed != null) {
-            bed = EntityHuman.getBed(((CraftWorld) world).getHandle(), bed, getHandle().isRespawnForced());
-            if (bed != null) {
-+            if (getHandle().isRespawnForced()) {
-                 return new Location(world, bed.x, bed.y, bed.z);
-             }
-+
-+            int cx = bed.x >> 4;
-+            int cz = bed.z >> 4;
-+            boolean before = world.isChunkLoaded(cx, cz);
-+
-+            if (!before) {
-+                world.loadChunk(cx, cz);
-+            }
-+
-+            Location location = null;
-+            if (world.getBlockTypeIdAt(bed.x, bed.y, bed.z) == Block.BED.id) {
-+                location = new Location(world, bed.x, bed.y, bed.z);
-+            }
-+
-+            if (!before) {
-+                world.unloadChunk(cx, cz);
-+            }
-+
-+            return location;
-         }
-         return null;
-     }
-- 
-1.8.1.2
-
--- a/CraftBukkit-Patches/0027-Faster-UUID-for-entities.patch
+++ b/CraftBukkit-Patches/0027-Faster-UUID-for-entities.patch
@ -1,4 +1,4 @@
-From 25514a2f378763e974783799c57dee62c67c1d20 Mon Sep 17 00:00:00 2001
+From dbd0d8f7e14ce0dbe01087ea315ef44fc26193ab Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 17 Mar 2013 19:02:50 +1100
 Subject: [PATCH] Faster UUID for entities
@ -6,7 +6,7 @@ Subject: [PATCH] Faster UUID for entities
 It is overkill to create a new SecureRandom on each entity create and then use it to make a new Entity ID for every entity instance created. Instead we will just use a pseudo random UUID based off the random instance we already have.

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 401edcc..a2a4f5a 100644
+index 438a26a..97b2522 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -154,7 +154,7 @@ public abstract class Entity {
--- a/CraftBukkit-Patches/0027-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
+++ b/CraftBukkit-Patches/0027-Remove-dependency-on-CraftPlayer.getBedSpawnLocation.patch
@ -1,30 +0,0 @@
-From 2f87ffb2fd330295fe5b602fc19cb3b0e0656570 Mon Sep 17 00:00:00 2001
-From: EdGruberman <ed@rjump.com>
-Date: Tue, 12 Feb 2013 16:17:31 -0700
-Subject: [PATCH] Remove dependency on CraftPlayer.getBedSpawnLocation; Fixes
- BUKKIT-3604
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0e3a6a1..305855b 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -495,7 +495,14 @@ public abstract class PlayerList {
-         if (exitWorld != null) {
-             if ((cause == TeleportCause.END_PORTAL) && (i == 0)) {
-                 // THE_END -> NORMAL; use bed if available, otherwise default spawn
-                exit = ((org.bukkit.craftbukkit.entity.CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation();
-+                ChunkCoordinates chunkcoordinates = entityplayer.getBed();
-+                CraftWorld spawnWorld = (CraftWorld) this.server.server.getWorld(entityplayer.spawnWorld);
-+                if (spawnWorld != null && chunkcoordinates != null) {
-+                    ChunkCoordinates chunkcoordinates1 = EntityHuman.getBed(spawnWorld.getHandle(), chunkcoordinates, entityplayer.isRespawnForced());
-+                    if (chunkcoordinates1 != null) {
-+                        exit = new Location(spawnWorld, chunkcoordinates1.x + 0.5, chunkcoordinates1.y, chunkcoordinates1.z + 0.5);
-+                    }
-+                }
-                 if (exit == null || ((CraftWorld) exit.getWorld()).getHandle().dimension != 0) {
-                     exit = exitWorld.getWorld().getSpawnLocation();
-                 }
-- 
-1.8.1.2
-
--- a/CraftBukkit-Patches/0028-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
+++ b/CraftBukkit-Patches/0028-BUKKIT-3661-fixed-missing-HangingBreakEvent-when-Ent.patch
@ -1,36 +0,0 @@
-From 7a8988d8f7c6f44262bee0be69d684109e2a863c Mon Sep 17 00:00:00 2001
-From: Yariv Livay <yarivlivay@gmail.com>
-Date: Sat, 2 Mar 2013 09:36:52 +1100
-Subject: [PATCH] BUKKIT-3661, fixed missing HangingBreakEvent when
- EntityHanging moves
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java
-index f697d85..1dfb02f 100644
--- a/src/main/java/net/minecraft/server/EntityHanging.java
-+++ b/src/main/java/net/minecraft/server/EntityHanging.java
-@@ -260,6 +260,21 @@ public abstract class EntityHanging extends Entity {
-         if (!this.world.isStatic && !this.dead && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) {
-             if (dead) return; // CraftBukkit
- 
-+            // CraftBukkit start
-+            HangingBreakEvent event = new HangingBreakEvent((Hanging) this.getBukkitEntity(), HangingBreakEvent.RemoveCause.PHYSICS);
-+            this.world.getServer().getPluginManager().callEvent(event);
-+
-+            PaintingBreakEvent paintingEvent = null;
-+            if (this instanceof EntityPainting) {
-+                // Fire old painting event until it can be removed
-+                paintingEvent = new PaintingBreakEvent((Painting) this.getBukkitEntity(), PaintingBreakEvent.RemoveCause.valueOf(event.getCause().name()));
-+                paintingEvent.setCancelled(event.isCancelled());
-+                this.world.getServer().getPluginManager().callEvent(paintingEvent);
-+            }
-+            if (event.isCancelled() || (paintingEvent != null && paintingEvent.isCancelled())) {
-+                return;
-+            }
-+            // CraftBukkit end
-             this.die();
-             this.h();
-         }
-- 
-1.8.1.2
-
--- a/CraftBukkit-Patches/0028-Prevent-NPE-in-CraftSign.patch
+++ b/CraftBukkit-Patches/0028-Prevent-NPE-in-CraftSign.patch
@ -1,4 +1,4 @@
-From 111f52275cda2c1d1f575424d2a407f6da589556 Mon Sep 17 00:00:00 2001
+From 62299e26a81eebde726d18656f2eebf061d099dd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 18 Mar 2013 20:01:44 +1100
 Subject: [PATCH] Prevent NPE in CraftSign
--- a/CraftBukkit-Patches/0029-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
+++ b/CraftBukkit-Patches/0029-Adds-BUKKIT-3667-Faux-sleepers-wake-up-normally.patch
@ -1,22 +0,0 @@
-From 89d5b237ade0d53899f7ef9e99d45bae78e88f21 Mon Sep 17 00:00:00 2001
-From: Yariv Livay <yarivlivay@gmail.com>
-Date: Mon, 25 Feb 2013 22:26:36 +0200
-Subject: [PATCH] Adds BUKKIT-3667, Faux sleepers wake up normally
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 7de5b48..9925d1b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
-+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -429,7 +429,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     }
- 
-     public void a(boolean flag, boolean flag1, boolean flag2) {
-        if (this.fauxSleeping && !this.sleeping) return; // CraftBukkit - Can't leave bed if not in one!
-+        if (!this.sleeping) return; // CraftBukkit - Can't leave bed if not in one!
- 
-         if (this.isSleeping()) {
-             this.o().getTracker().sendPacketToEntity(this, new Packet18ArmAnimation(this, 3));
-- 
-1.8.1.2
-
--- a/CraftBukkit-Patches/0029-Entity-Tracking-Ranges.patch
+++ b/CraftBukkit-Patches/0029-Entity-Tracking-Ranges.patch
@ -1,4 +1,4 @@
-From 1ee15ef0c0ce6a8016991314892246011fded197 Mon Sep 17 00:00:00 2001
+From 02e93bf58da5b4859c345f9c030d270616ccefa7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Feb 2013 11:58:47 -0500
 Subject: [PATCH] Entity Tracking Ranges
@ -24,10 +24,10 @@ index d7efe3e..59586c2 100644
             i = this.d;
         }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 2824b17..86d6939 100644
+index 27323a0..c93793f 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -168,4 +168,19 @@ public class SpigotWorldConfig
+@@ -147,4 +147,19 @@ public class SpigotWorldConfig
         miscActivationRange = getInt( "entity-activation-range.misc", miscActivationRange );
         log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Mi " + miscActivationRange );
     }
--- a/CraftBukkit-Patches/0030-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0030-BungeeCord-Support.patch
@ -1,4 +1,4 @@
-From 994bb48cde58d9f7888008c5cc2585b7b5d12cb1 Mon Sep 17 00:00:00 2001
+From 03a26fd523523a2d4e01d9e680d619ac3cb4aec1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support
@ -28,7 +28,7 @@ index a945892..e78781e 100644
 +    // Spigot end
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f748492..e9b4c18 100644
+index b7e327b..30c6503 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -293,7 +293,7 @@ public abstract class PlayerList {
@ -59,10 +59,10 @@ index 1254e63..a4eae65 100644
                     event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage());
                 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8ec84e1..d70c110 100644
+index 7cae665..21141f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1016,6 +1016,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -998,6 +998,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
     // Spigot start
     private final Spigot spigot = new Spigot()
     {
--- a/CraftBukkit-Patches/0031-Limit-Custom-Map-Rendering.patch
+++ b/CraftBukkit-Patches/0031-Limit-Custom-Map-Rendering.patch
@ -1,4 +1,4 @@
-From 9b13c53b9a7779891bd61377204d8d743c890839 Mon Sep 17 00:00:00 2001
+From 2f81e3294321a9bfcb00956f75bb54ea5cdfecf5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 19:08:41 +1100
 Subject: [PATCH] Limit Custom Map Rendering
--- a/CraftBukkit-Patches/0032-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
+++ b/CraftBukkit-Patches/0032-Revert-Throw-exception-for-disabled-plugin-tasks.-Fi.patch
@ -1,4 +1,4 @@
-From 46f2ad93239b4f6c92b8187f4e6b54c6d19e9aa3 Mon Sep 17 00:00:00 2001
+From 002897e8a239938b0a072e9c89ecc2dc39e88a1c Mon Sep 17 00:00:00 2001
 From: Hudson <hudson@mydomain.com>
 Date: Wed, 3 Apr 2013 02:16:56 -0500
 Subject: [PATCH] Revert "Throw exception for disabled plugin tasks. Fixes
--- a/CraftBukkit-Patches/0033-Enable-Improved-ping-sending.patch
+++ b/CraftBukkit-Patches/0033-Enable-Improved-ping-sending.patch
@ -1,4 +1,4 @@
-From 40640764e8461fdc97f93fad90d081b1ef8975f1 Mon Sep 17 00:00:00 2001
+From 9b8d56fab138108ef3d328c5fe52cade92b13ce3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Feb 2013 20:45:20 +1100
 Subject: [PATCH] Enable Improved ping sending
@ -8,7 +8,7 @@ Subject: [PATCH] Enable Improved ping sending
 3 files changed, 18 insertions(+)

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9925d1b..5fa0b05 100644
+index 7de5b48..35a579c 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -51,6 +51,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -20,10 +20,10 @@ index 9925d1b..5fa0b05 100644
 
     public EntityPlayer(MinecraftServer minecraftserver, World world, String s, PlayerInteractManager playerinteractmanager) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index e9b4c18..c61e959 100644
+index 30c6503..a236c5f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -724,7 +724,23 @@ public abstract class PlayerList {
+@@ -717,7 +717,23 @@ public abstract class PlayerList {
             this.sendAll(new Packet201PlayerInfo(entityplayer.name, true, entityplayer.ping));
         }
         // CraftBukkit end */
--- a/CraftBukkit-Patches/0034-Prevent-handshake-spam-from-invalid-names.patch
+++ b/CraftBukkit-Patches/0034-Prevent-handshake-spam-from-invalid-names.patch
@ -1,4 +1,4 @@
-From ae91a14ab631e23dfaa70e8e5db25ce04e633421 Mon Sep 17 00:00:00 2001
+From 81f21d28642e50e9fae1f7feadbb2882e7820f40 Mon Sep 17 00:00:00 2001
 From: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>
 Date: Sun, 14 Apr 2013 21:19:57 +0500
 Subject: [PATCH] Prevent handshake spam from invalid names.
--- a/CraftBukkit-Patches/0035-Save-entity-counts-for-randomly-spawned-creatures-to.patch
+++ b/CraftBukkit-Patches/0035-Save-entity-counts-for-randomly-spawned-creatures-to.patch
@ -1,4 +1,4 @@
-From a581070d4f85e5c3983652d21685db6369c2115d Mon Sep 17 00:00:00 2001
+From 9f6ff0b5899268bf52d195f7316c97d0b43ec22b Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Sat, 20 Apr 2013 12:26:20 +0500
 Subject: [PATCH] Save entity counts for randomly spawned creatures to avoid
--- a/CraftBukkit-Patches/0036-Thread-Naming-and-Tweaks.patch
+++ b/CraftBukkit-Patches/0036-Thread-Naming-and-Tweaks.patch
@ -1,4 +1,4 @@
-From 8ebad61b5d641b61b642ad178ee8c9abfde0d53e Mon Sep 17 00:00:00 2001
+From 86bed296f3b5ca333b92ae8d08ca2345b9d9a55f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:50:27 +1000
 Subject: [PATCH] Thread Naming and Tweaks
--- a/CraftBukkit-Patches/0037-Close-Unloaded-World-s-Save-Files.patch
+++ b/CraftBukkit-Patches/0037-Close-Unloaded-World-s-Save-Files.patch
@ -1,4 +1,4 @@
-From 93a348f809ef9fa14ea5276b433ee93d55e640a9 Mon Sep 17 00:00:00 2001
+From 26cc0b29eadbb08eb1b3c68895e3c3c2ac217d76 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Wed, 27 Mar 2013 01:41:54 +0200
 Subject: [PATCH] Close Unloaded World's Save Files
@ -18,7 +18,7 @@ index 900ed68..829f4a3 100644
     public static synchronized RegionFile a(File file1, int i, int j) {
         File file2 = new File(file1, "region");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7f5f3ea..3b58d23 100644
+index 20ba4b7..2e8187e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -37,6 +37,8 @@ import net.minecraft.server.MinecraftServer;
@ -30,7 +30,7 @@ index 7f5f3ea..3b58d23 100644
 import net.minecraft.server.ServerNBTManager;
 import net.minecraft.server.WorldLoaderServer;
 import net.minecraft.server.WorldManager;
-@@ -809,6 +811,30 @@ public final class CraftServer implements Server {
+@@ -808,6 +810,30 @@ public final class CraftServer implements Server {
         worlds.remove(world.getName().toLowerCase());
         console.worlds.remove(console.worlds.indexOf(handle));
 
--- a/CraftBukkit-Patches/0038-Optimized-version-of-LocaleLanguage.patch
+++ b/CraftBukkit-Patches/0038-Optimized-version-of-LocaleLanguage.patch
@ -1,4 +1,4 @@
-From 72faab2a4b5943d65aa75c3b746b2306c85a32d0 Mon Sep 17 00:00:00 2001
+From da31d0f873c70b080ce64923ce8879ad80c37383 Mon Sep 17 00:00:00 2001
 From: snowleo <schneeleo@gmail.com>
 Date: Wed, 8 May 2013 12:09:45 +1000
 Subject: [PATCH] Optimized version of LocaleLanguage
--- a/CraftBukkit-Patches/0039-Improve-next-tick-list-performance-on-chunk-unloads-.patch
+++ b/CraftBukkit-Patches/0039-Improve-next-tick-list-performance-on-chunk-unloads-.patch
@ -1,4 +1,4 @@
-From 9531eb712fffefc655e0e254b93d671019da2bdd Mon Sep 17 00:00:00 2001
+From 73fc7751d67136785fe9dd8e37e6bd93e2b70b2a Mon Sep 17 00:00:00 2001
 From: Mike Primm <mike@primmhome.com>
 Date: Wed, 24 Apr 2013 01:43:33 -0500
 Subject: [PATCH] Improve next-tick-list performance on chunk unloads, large
--- a/CraftBukkit-Patches/0040-Remove-o-Option.patch
+++ b/CraftBukkit-Patches/0040-Remove-o-Option.patch
@ -1,4 +1,4 @@
-From 375ef52cac5e16e1375dc9428262dd691dc3c034 Mon Sep 17 00:00:00 2001
+From e5fe9ccaefc62d0e2ec1c6c3f6c86f6d3512a77c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 19 May 2013 18:29:48 +1000
 Subject: [PATCH] Remove -o Option
--- a/CraftBukkit-Patches/0041-Recipe-Deconstruction.patch
+++ b/CraftBukkit-Patches/0041-Recipe-Deconstruction.patch
@ -1,4 +1,4 @@
-From 42746263ae062c4cfe850bdda0cf2118e722e0dc Mon Sep 17 00:00:00 2001
+From aa8e03fbad9d6f5752f6a607cf9f4be005a0a645 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 1 Jun 2013 16:34:38 +1000
 Subject: [PATCH] Recipe Deconstruction
--- a/CraftBukkit-Patches/0042-Fix-Health-Scaling.patch
+++ b/CraftBukkit-Patches/0042-Fix-Health-Scaling.patch
@ -1,4 +1,4 @@
-From be8e4ab02339079e2041fb9c48e8f209865d374b Mon Sep 17 00:00:00 2001
+From de527072801296213e67bec9e91c49309864229d Mon Sep 17 00:00:00 2001
 From: Nick Minkler <sleaker@gmail.com>
 Date: Sun, 2 Jun 2013 14:54:11 +1000
 Subject: [PATCH] Fix Health Scaling
--- a/CraftBukkit-Patches/0043-Fix-EntityShootBowEvent-with-Skeletons.patch
+++ b/CraftBukkit-Patches/0043-Fix-EntityShootBowEvent-with-Skeletons.patch
@ -1,4 +1,4 @@
-From 55a0a124577e32e4dfb70ae447c9ddd8568075cd Mon Sep 17 00:00:00 2001
+From 7fdad06746184ebc24668b3358d60142108107d5 Mon Sep 17 00:00:00 2001
 From: Nick Minkler <sleaker@gmail.com>
 Date: Sun, 2 Jun 2013 15:04:37 +1000
 Subject: [PATCH] Fix EntityShootBowEvent with Skeletons
--- a/CraftBukkit-Patches/0044-Implement-Arrow-API.patch
+++ b/CraftBukkit-Patches/0044-Implement-Arrow-API.patch
@ -1,4 +1,4 @@
-From d255de2f39d158f0e7ecb8039c9f976d03baddcb Mon Sep 17 00:00:00 2001
+From 6a923051c0ba21fb7179bac35c4b4a93562b90bc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:16:05 +1000
 Subject: [PATCH] Implement Arrow API
--- a/CraftBukkit-Patches/0045-Particle-API.patch
+++ b/CraftBukkit-Patches/0045-Particle-API.patch
@ -1,4 +1,4 @@
-From b15953996bfacb57262151924528753e9ebd5099 Mon Sep 17 00:00:00 2001
+From da41cfb02d8d4c9c0ef92f3da1d0dba1ad597c86 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 16:14:30 +1000
 Subject: [PATCH] Particle API
@ -152,7 +152,7 @@ index edc59b1..0778a66 100644
 
     public Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d70c110..43e953e 100644
+index 21141f2..feed78e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -266,13 +266,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -191,7 +191,7 @@ index d70c110..43e953e 100644
     }
 
     public void sendBlockChange(Location loc, Material material, byte data) {
-@@ -1021,6 +1024,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1003,6 +1006,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         {
             return ( getHandle().playerConnection == null ) ? null : (InetSocketAddress) getHandle().playerConnection.networkManager.getSocket().getRemoteSocketAddress();
         }
--- a/CraftBukkit-Patches/0046-Hopper-Cooldowns.patch
+++ b/CraftBukkit-Patches/0046-Hopper-Cooldowns.patch
@ -1,4 +1,4 @@
-From 36772025aed5f5fdbac6cdee69450f411ee4f462 Mon Sep 17 00:00:00 2001
+From 7325b38754de53b35873781b6c28d4aa9afabff9 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sun, 2 Jun 2013 16:23:46 +1000
 Subject: [PATCH] Hopper Cooldowns
@ -64,10 +64,10 @@ index f6d269d..1f69c7b 100644
 
                 iinventory.update();
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 86d6939..9cc89a3 100644
+index c93793f..75e72e0 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -183,4 +183,13 @@ public class SpigotWorldConfig
+@@ -162,4 +162,13 @@ public class SpigotWorldConfig
         maxTrackingRange = getInt( "entity-tracking-range.other", maxTrackingRange );
         log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + maxTrackingRange );
     }
--- a/CraftBukkit-Patches/0047-Prevent-Shutdown-Hang.patch
+++ b/CraftBukkit-Patches/0047-Prevent-Shutdown-Hang.patch
@ -1,4 +1,4 @@
-From fdd4ba069b61f6dde73fbf37852dc2e5b99a09ee Mon Sep 17 00:00:00 2001
+From 8a29ec73d104d1095f4e308ca9f544360a36604d Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 11 Jun 2013 11:54:32 +1000
 Subject: [PATCH] Prevent Shutdown Hang
@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Shutdown Hang
 Prevents server hanging if players disconnect during the shutdown sequence.

 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index c61e959..8b58243 100644
+index a236c5f..6a58663 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1071,7 +1071,14 @@ public abstract class PlayerList {
+@@ -1064,7 +1064,14 @@ public abstract class PlayerList {
 
     public void r() {
         while (!this.players.isEmpty()) {
--- a/CraftBukkit-Patches/0048-Implement-SpawnerSpawnEvent.patch
+++ b/CraftBukkit-Patches/0048-Implement-SpawnerSpawnEvent.patch
@ -1,4 +1,4 @@
-From c8083dfc6564728b5f536ca9696add3be6b6c246 Mon Sep 17 00:00:00 2001
+From a3262c25cfe4ed0aba83221d6ead8287fff8b7a7 Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:37 -0500
 Subject: [PATCH] Implement SpawnerSpawnEvent.
--- a/CraftBukkit-Patches/0049-Firework-Meta-Crash-Fix.patch
+++ b/CraftBukkit-Patches/0049-Firework-Meta-Crash-Fix.patch
@ -1,4 +1,4 @@
-From 28e3a04e9578daab00bac557fb9f8ec7246b35af Mon Sep 17 00:00:00 2001
+From 74402ddfe7d7f0a239f0ee650d08fcde49e5ca46 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 15 Jun 2013 21:34:48 +1000
 Subject: [PATCH] Firework Meta Crash Fix
--- a/CraftBukkit-Patches/0050-Do-Not-Search-for-Offline-Players.patch
+++ b/CraftBukkit-Patches/0050-Do-Not-Search-for-Offline-Players.patch
@ -1,4 +1,4 @@
-From 73b733afa224073a9ea2f64bafcc94db3230e8e0 Mon Sep 17 00:00:00 2001
+From e6ff7cb814f556fd3bac83c60e8a7d89d147e339 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 16 Jun 2013 08:20:26 +1000
 Subject: [PATCH] Do Not Search for Offline Players
@ -6,10 +6,10 @@ Subject: [PATCH] Do Not Search for Offline Players
 By default we do not want to search as this leads to massive load times for plugins wanting to do mass data lookups.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3b58d23..71643cc 100644
+index 2e8187e..e7f4b14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1086,7 +1086,7 @@ public final class CraftServer implements Server {
+@@ -1085,7 +1085,7 @@ public final class CraftServer implements Server {
     }
 
     public OfflinePlayer getOfflinePlayer(String name) {