Pop anti xray patch to top

CraftBukkit-Patches/0017-Fix-Mob-Spawning-Relative-to-View-Distance.patch

@@ -1,4 +1,4 @@
-From db2106733be2b8cf3ebae74d23e77382c41512f8 Mon Sep 17 00:00:00 2001
+From a50a9504115d90dfa6ea3de353605b725356e219 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 17:29:54 +1000
 Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@@ -135,12 +135,12 @@ index f514b78..3f0dd70 100644
                                                                      continue label110;
                                                                  }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 3a4f338..47d9015 100644
+index 97d56bd..47d8421 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -153,4 +153,11 @@ public class SpigotWorldConfig
+@@ -127,4 +127,11 @@ public class SpigotWorldConfig
- 
+         viewDistance = getInt( "view-distance", Bukkit.getViewDistance() );
-         antiXrayInstance = new AntiXray( this );
+         log( "View Distance: " + viewDistance );
      }
 +
 +    public byte mobSpawnRange;

CraftBukkit-Patches/0018-Handle-Null-Tile-Entities.patch

@@ -1,14 +1,14 @@
-From e70f120999ce4597e539407cf4d83a1e56d941f4 Mon Sep 17 00:00:00 2001
+From de5e98722f7b1da2c59104c7e729b1d0167cf8d2 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 3 Feb 2013 09:20:19 +1100
 Subject: [PATCH] Handle Null Tile Entities
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3e41e82..1a8388a 100644
+index 5cfcc6c..59122b3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1312,6 +1312,13 @@ public abstract class World implements IBlockAccess {
+@@ -1311,6 +1311,13 @@ public abstract class World implements IBlockAccess {
  
          while (iterator.hasNext()) {
              TileEntity tileentity = (TileEntity) iterator.next();

CraftBukkit-Patches/0019-Entity-Activation-Range.patch

@@ -1,4 +1,4 @@
-From aef4d944e95433be138fd0e104bbc1bced93430b Mon Sep 17 00:00:00 2001
+From d3d107b5eb4aeba6af1c9a12ecf4c1e9555bc345 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
@@ -116,10 +116,10 @@ index 75b1ec1..a61001d 100644
      public EntityLiving(World world) {
          super(world);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1a8388a..2e3597f 100644
+index 59122b3..5b201af 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1254,6 +1254,7 @@ public abstract class World implements IBlockAccess {
+@@ -1253,6 +1253,7 @@ public abstract class World implements IBlockAccess {
          this.f.clear();
          this.methodProfiler.c("regular");
  
@@ -127,7 +127,7 @@ index 1a8388a..2e3597f 100644
          timings.entityTick.startTiming(); // Spigot
          for (i = 0; i < this.entityList.size(); ++i) {
              entity = (Entity) this.entityList.get(i);
-@@ -1414,7 +1415,11 @@ public abstract class World implements IBlockAccess {
+@@ -1413,7 +1414,11 @@ public abstract class World implements IBlockAccess {
          int j = MathHelper.floor(entity.locZ);
          byte b0 = 32;
  
@@ -457,10 +457,10 @@ index 0000000..db4c927
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 47d9015..5bda2e5 100644
+index 47d8421..f7c6166 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -160,4 +160,15 @@ public class SpigotWorldConfig
+@@ -134,4 +134,15 @@ public class SpigotWorldConfig
          mobSpawnRange = (byte) getInt( "mob-spawn-range", 4 );
          log( "Mob Spawn Range: " + mobSpawnRange );
      }

CraftBukkit-Patches/0020-Metrics.patch

@@ -1,4 +1,4 @@
-From ce4cce7fa8d4f2c732f1b0c678a87921b10d39f0 Mon Sep 17 00:00:00 2001
+From 49a2a0e5778e2a7cf9a8758b87ea42a23e6a20e1 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 08:58:35 +1100
 Subject: [PATCH] Metrics
@@ -657,7 +657,7 @@ index 0000000..f1690a2
 +}
 \ No newline at end of file
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index b5d611b..6a37636 100644
+index a4f47f5..31e708c 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -36,6 +36,7 @@ public class SpigotConfig

CraftBukkit-Patches/0021-PlayerItemDamageEvent.patch

@@ -1,4 +1,4 @@
-From 95f1227925ed89e4582ce588573b111bfdc493cf Mon Sep 17 00:00:00 2001
+From daed468c7916d5bf90cc56e5c16558ec5492db97 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

CraftBukkit-Patches/0022-Faster-UUID-for-entities.patch

@@ -1,4 +1,4 @@
-From 8872a271c0baa9652277eae7a2eec788883f682d Mon Sep 17 00:00:00 2001
+From 2a4096821e7e43cfc9eae481b34d56abd1738c05 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
@@ -19,5 +19,5 @@ index 4d573e6..6ccba9f 100644
          this.world = world;
          this.setPosition(0.0D, 0.0D, 0.0D);
 -- 
-1.8.4.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0023-Prevent-NPE-in-CraftSign.patch

@@ -1,4 +1,4 @@
-From f0f90a6b9732962e719dd67d946a69b3550ca127 Mon Sep 17 00:00:00 2001
+From fbffdd786e69da9fa784b0a7a5f17ef9cdad9364 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

CraftBukkit-Patches/0024-Entity-Tracking-Ranges.patch

@@ -1,4 +1,4 @@
-From 4df31e16f45eb8f0f5088616cf65230a56838594 Mon Sep 17 00:00:00 2001
+From d0d3a306c90d16d0823144156cb439690acd8f6b 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 97d0bbb..fc679ae 100644
              i = this.e;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5bda2e5..d6e8433 100644
+index f7c6166..92497f5 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -171,4 +171,19 @@ public class SpigotWorldConfig
+@@ -145,4 +145,19 @@ public class SpigotWorldConfig
          miscActivationRange = getInt( "entity-activation-range.misc", miscActivationRange );
          log( "Entity Activation Range: An " + animalActivationRange + " / Mo " + monsterActivationRange + " / Mi " + miscActivationRange );
      }

CraftBukkit-Patches/0025-Limit-Custom-Map-Rendering.patch

@@ -1,4 +1,4 @@
-From 4a3cd24fec99d9d0a41dfa3d90d64ae29aabd31a Mon Sep 17 00:00:00 2001
+From 8eca8e635aa5c86ab619ac974fac6fbcb004e348 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
@@ -57,7 +57,7 @@ index ec708d1..ef56386 100644
  
                      this.c[i] = -1;
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
-index b28d6a3..e70e4e4 100644
+index 1a150d9..c9f0027 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
 @@ -18,7 +18,7 @@ import org.bukkit.map.MapView;

CraftBukkit-Patches/0026-Enable-Improved-Ping-Sending.patch

@@ -1,4 +1,4 @@
-From 79bffbcd6957abfa4770f25175d370f0363de1b5 Mon Sep 17 00:00:00 2001
+From c653a8aa3f0502140e17e409a2c2846f3209da79 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
@@ -17,7 +17,7 @@ index 42fa9e0..af08d2f 100644
  
      public EntityPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile, PlayerInteractManager playerinteractmanager) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index df28a59..b71ee29 100644
+index 534073b..07cee4d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -765,6 +765,25 @@ public abstract class PlayerList {

CraftBukkit-Patches/0027-Thread-Naming-and-Tweaks.patch

@@ -1,4 +1,4 @@
-From 379a06c3df065bc8ea719c01ce7a0a25e9d3e017 Mon Sep 17 00:00:00 2001
+From 0dfc9d0708a3ced454a6c6ee303187cd8bb28319 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

CraftBukkit-Patches/0028-Close-Unloaded-Save-Files.patch

@@ -1,4 +1,4 @@
-From 68903a9fb06c84df81f3b9aaeb0bc988aec38ad9 Mon Sep 17 00:00:00 2001
+From 8dec60c77bd9ad594db0d39064694e622bb533ac 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 Save Files

CraftBukkit-Patches/0029-Remove-o-Option.patch

@@ -1,4 +1,4 @@
-From e6c9e6890683727ba05918bb5b431dc03ca93f05 Mon Sep 17 00:00:00 2001
+From c39c39a928eda29e6f9d7d63aa7a757d95f1b2f6 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

CraftBukkit-Patches/0030-Recipe-Deconstruction.patch

@@ -1,4 +1,4 @@
-From 9a3ca00c2b936410c119b33b0850085f881caedd Mon Sep 17 00:00:00 2001
+From 183462949271882897bf6ddc87b7e0eb6caf086a 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

CraftBukkit-Patches/0031-Implement-Arrow-API.patch

@@ -1,4 +1,4 @@
-From 3f559eb3905e65ab6c39e930e9c0ef049e048ef3 Mon Sep 17 00:00:00 2001
+From de3c226618c36c14f88d66d70dc21ec3e4bf1822 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

CraftBukkit-Patches/0032-Hopper-Cooldowns.patch

@@ -1,4 +1,4 @@
-From 8a1d964f7cb36ae4498be6c3c3335001bfec5bff Mon Sep 17 00:00:00 2001
+From 3259be7f9a8eeb25f1a11bb78cdef5417153da69 Mon Sep 17 00:00:00 2001
 From: erocs <github@erocs.org>
 Date: Sun, 8 Sep 2013 12:06:15 -0700
 Subject: [PATCH] Hopper Cooldowns
@@ -59,10 +59,10 @@ index 730eb78..a68b748 100644
                  }
  
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index d6e8433..4e4db0a 100644
+index 92497f5..fc0aa4c 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -186,4 +186,17 @@ public class SpigotWorldConfig
+@@ -160,4 +160,17 @@ public class SpigotWorldConfig
          maxTrackingRange = getInt( "entity-tracking-range.other", maxTrackingRange );
          log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + maxTrackingRange );
      }

CraftBukkit-Patches/0033-Prevent-Shutdown-Hang.patch

@@ -1,4 +1,4 @@
-From 857c0f61b79df4501764c80d6a73f0a7cebc814b Mon Sep 17 00:00:00 2001
+From 29af0b68516d438e933cfba482a4423b1d5d0c17 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,7 +6,7 @@ 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 b71ee29..196ac4f 100644
+index 07cee4d..1725bba 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1115,8 +1115,15 @@ public abstract class PlayerList {

CraftBukkit-Patches/0034-Implement-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 1de9abd64aaa595440c4832b07f329c9df34b59e Mon Sep 17 00:00:00 2001
+From 6b89cb3671a2e4da0b334867136326b4ff98e0f7 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.

CraftBukkit-Patches/0035-Firework-Meta-Crash-Fix.patch

@@ -1,4 +1,4 @@
-From eda939c6e4776f4aba7ff67d1e12c860fa7c7490 Mon Sep 17 00:00:00 2001
+From 04efb5156adbb4ee0fc54ce69f405e5357129935 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

CraftBukkit-Patches/0036-Do-Not-Search-for-Offline-Players.patch

@@ -1,4 +1,4 @@
-From 9c61bb156390398f037c340ed15b7419a90f02c0 Mon Sep 17 00:00:00 2001
+From 14d76502e1a0bb93291be25cc0ae0b415504b76d 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

CraftBukkit-Patches/0037-Allow-Disabling-of-Command-Logging.patch

@@ -1,4 +1,4 @@
-From 3e7fbdf04a48f981b99a6acdbce907b2da2fead0 Mon Sep 17 00:00:00 2001
+From d7a201d255ff143edf20b3ae9d1f901fadd79b71 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:01:29 +1000
 Subject: [PATCH] Allow Disabling of Command Logging
@@ -23,7 +23,7 @@ index c4ed619..67c8bba 100644
                  org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
                  return;
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 6a37636..837fcc9 100644
+index 31e708c..895af4b 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -136,4 +136,10 @@ public class SpigotConfig

CraftBukkit-Patches/0038-Allow-Disabling-of-Command-TabComplete.patch

@@ -1,4 +1,4 @@
-From b87bcabe08a52c31fa67fa8cdaed3ceb8842da70 Mon Sep 17 00:00:00 2001
+From 30b566390c93fe321c36d403a6deb36a6f3c4b83 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 18:05:54 +1000
 Subject: [PATCH] Allow Disabling of Command TabComplete
@@ -18,7 +18,7 @@ index 11f018b..abe05dc 100644
              player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
              getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 837fcc9..3cdd6ac 100644
+index 895af4b..21dc8c7 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -142,4 +142,10 @@ public class SpigotConfig

CraftBukkit-Patches/0039-Configurable-Messages.patch

@@ -1,4 +1,4 @@
-From 0d0356e87624e867a525ca00fa12f45f09fe41d1 Mon Sep 17 00:00:00 2001
+From 8e53003721108a451c7af13e8f4c28df0446943c Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 21 Jun 2013 19:21:58 +1000
 Subject: [PATCH] Configurable Messages
@@ -23,7 +23,7 @@ index b7f6775..b96e2ef 100644
                  this.b.a((IChatBaseComponent) chatcomponenttext);
              } else {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f3294b0..81dbf37 100644
+index 1725bba..5174602 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -335,7 +335,7 @@ public abstract class PlayerList {
@@ -62,7 +62,7 @@ index abe05dc..be43d4b 100644
          return false;
      }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 3cdd6ac..2420570 100644
+index 21dc8c7..7c07142 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -12,6 +12,7 @@ import java.util.Map;

CraftBukkit-Patches/0040-Allow-Disabling-of-Random-Lighting-Updates.patch

@@ -1,4 +1,4 @@
-From cc40d3ae5934613369a65ff132206e31ddb6d6e2 Mon Sep 17 00:00:00 2001
+From a7666aa6f9f5b02c97af2d14d74728f63cab8dfa Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 22 Jun 2013 16:12:02 +1000
 Subject: [PATCH] Allow Disabling of Random Lighting Updates
@@ -18,10 +18,10 @@ index 3bcca91..efe7ca5 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2e3597f..4db02ce 100644
+index 5b201af..6ed8e56 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -2044,7 +2044,7 @@ public abstract class World implements IBlockAccess {
+@@ -2043,7 +2043,7 @@ public abstract class World implements IBlockAccess {
          }
  
          this.methodProfiler.a("playerCheckLight");
@@ -31,10 +31,10 @@ index 2e3597f..4db02ce 100644
              entityhuman = (EntityHuman) this.players.get(i);
              j = MathHelper.floor(entityhuman.locX) + this.random.nextInt(11) - 5;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 4e4db0a..1422e38 100644
+index fc0aa4c..eb118c6 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -199,4 +199,11 @@ public class SpigotWorldConfig
+@@ -173,4 +173,11 @@ public class SpigotWorldConfig
          hopperCheck = getInt( "ticks-per.hopper-check", hopperTransfer );
          log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck );
      }

CraftBukkit-Patches/0041-Make-AnvilInventory.getItem-use-both-containers.-Fix.patch

@@ -1,4 +1,4 @@
-From 0b94ac6d0df1b531c85fd75fdb6b3b86f47938fc Mon Sep 17 00:00:00 2001
+From ef5c9f927cb2341466cc30264f53e087856bd31b Mon Sep 17 00:00:00 2001
 From: Andre LeBlanc <andre@norcode.com>
 Date: Sat, 6 Apr 2013 12:00:31 -0400
 Subject: [PATCH] Make AnvilInventory.getItem() use both containers. Fixes

CraftBukkit-Patches/0042-Properly-Close-Inventories.patch

@@ -1,4 +1,4 @@
-From e5dc58c13bf6109115565aea6a33b46880650fd2 Mon Sep 17 00:00:00 2001
+From 7e52e67df82bd2d4376cb31ba475cc8e2fb8d89f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 27 Jun 2013 17:26:09 +1000
 Subject: [PATCH] Properly Close Inventories
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories
 Properly close inventories when unloading and switching worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3bcca91..99c30f9 100644
+index efe7ca5..a4adc56 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -749,6 +749,15 @@ public class Chunk {

CraftBukkit-Patches/0043-Disallow-Interaction-With-Self.patch

@@ -1,4 +1,4 @@
-From 7b8d520d0c8aff3c622647bf434e312645c72a4c Mon Sep 17 00:00:00 2001
+From 7a04ca8d3b12f0368dcf7c01b6e6fe51882f7126 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 28 Jun 2013 19:52:54 +1000
 Subject: [PATCH] Disallow Interaction With Self

CraftBukkit-Patches/0044-Lower-Chunk-Compression.patch

@@ -1,4 +1,4 @@
-From 53f54e7754a93ba7d6c0cd7ce423f5e26cd13836 Mon Sep 17 00:00:00 2001
+From 06d1ce1c482f579482fe230b4c41fa7cb33973e3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:07:54 +1000
 Subject: [PATCH] Lower Chunk Compression
@@ -6,7 +6,7 @@ Subject: [PATCH] Lower Chunk Compression
 Use a chunk compression level of 4 - this provides an optimal balance between speed and compression.
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 7169ec8..3006712 100644
+index 856e825..09b34e9 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -24,7 +24,7 @@ public class PacketPlayOutMapChunk extends Packet {
@@ -19,7 +19,7 @@ index 7169ec8..3006712 100644
          this.d = chunkmap.c;
          this.c = chunkmap.b;
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java
-index c3cfdc7..8e1c4cb 100644
+index 3eac231..bf3a139 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java
 @@ -22,7 +22,7 @@ public class PacketPlayOutMapChunkBulk extends Packet {

CraftBukkit-Patches/0045-Entity-Mount-and-Dismount-Events.patch

@@ -1,4 +1,4 @@
-From 81e0c28d1d10bca5fe94f73c337ef54f700c4bc6 Mon Sep 17 00:00:00 2001
+From da427d15e35d48c153f18db70c3161ce6188b7c5 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 Subject: [PATCH] Entity Mount and Dismount Events

CraftBukkit-Patches/0046-Prevent-Ghost-Players-Caused-by-Plugins.patch

@@ -1,4 +1,4 @@
-From ea43ddf0c68dfcd900dae253b725fa62cac82688 Mon Sep 17 00:00:00 2001
+From 673ed9f4513675fe1c471831a561659af443cf5e Mon Sep 17 00:00:00 2001
 From: Alex Ciuba <alexciuba@gmail.com>
 Date: Tue, 11 Jun 2013 15:23:03 -0400
 Subject: [PATCH] Prevent Ghost Players Caused by Plugins

CraftBukkit-Patches/0047-Entity-ticking-chunk-caching.patch

@@ -1,4 +1,4 @@
-From 4744856be374f949345575c80fcc212185d5877e Mon Sep 17 00:00:00 2001
+From 5332b6d382ae1701491ee3753989710d61364ce2 Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Tue, 16 Jul 2013 03:32:32 +0500
 Subject: [PATCH] Entity ticking chunk caching
@@ -6,10 +6,10 @@ Subject: [PATCH] Entity ticking chunk caching
 Cache known loaded chunks so we avoid making a potentially expensive contains call for every single entity in exchange for some simple arithmetic. Best case scenario, this cuts down contains call to once per chunk, worst case it adds on some simple arithmetic operations
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4db02ce..ae93c2d 100644
+index 6ed8e56..7cded7b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1199,6 +1199,7 @@ public abstract class World implements IBlockAccess {
+@@ -1198,6 +1198,7 @@ public abstract class World implements IBlockAccess {
          CrashReport crashreport;
          CrashReportSystemDetails crashreportsystemdetails;
  
@@ -17,7 +17,7 @@ index 4db02ce..ae93c2d 100644
          for (i = 0; i < this.i.size(); ++i) {
              entity = (Entity) this.i.get(i);
              // CraftBukkit start - Fixed an NPE, don't process entities in chunks queued for unload
-@@ -1207,10 +1208,15 @@ public abstract class World implements IBlockAccess {
+@@ -1206,10 +1207,15 @@ public abstract class World implements IBlockAccess {
              }
  
              ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
@@ -35,7 +35,7 @@ index 4db02ce..ae93c2d 100644
  
              try {
                  ++entity.ticksLived;
-@@ -1231,6 +1237,7 @@ public abstract class World implements IBlockAccess {
+@@ -1230,6 +1236,7 @@ public abstract class World implements IBlockAccess {
                  this.i.remove(i--);
              }
          }
@@ -43,7 +43,7 @@ index 4db02ce..ae93c2d 100644
  
          this.methodProfiler.c("remove");
          this.entityList.removeAll(this.f);
-@@ -1261,10 +1268,15 @@ public abstract class World implements IBlockAccess {
+@@ -1260,10 +1267,15 @@ public abstract class World implements IBlockAccess {
  
              // CraftBukkit start - Don't tick entities in chunks queued for unload
              ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;

CraftBukkit-Patches/0048-Plug-World-Unload-Memory-Leak.patch

@@ -1,4 +1,4 @@
-From 2a525afc328aa1d95b7cbddef5551a3cae5fce1c Mon Sep 17 00:00:00 2001
+From 5d75fc19fab70571cd9f4bbbbb7dd09ed20d33ee Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:02:59 +1000
 Subject: [PATCH] Plug World Unload Memory Leak

CraftBukkit-Patches/0049-Player-Collision-API.patch

@@ -1,4 +1,4 @@
-From 284ebc56e921a516af0011350d25ed729ef2cc54 Mon Sep 17 00:00:00 2001
+From e06caf926bf30ae3585bef652cbd000bf44a6ebd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:27:07 +1000
 Subject: [PATCH] Player Collision API

CraftBukkit-Patches/0050-Fully-Disable-Snooper-When-Not-Required.patch

@@ -1,4 +1,4 @@
-From aea228d0d70cb6b17ad2623d19b41c95d7f5a51f Mon Sep 17 00:00:00 2001
+From 6eeca020dbe3c480f2c40d78570122ee202d8286 Mon Sep 17 00:00:00 2001
 From: agentk20 <agentkid20@gmail.com>
 Date: Sat, 3 Aug 2013 19:28:48 +1000
 Subject: [PATCH] Fully Disable Snooper When Not Required

CraftBukkit-Patches/0051-Add-Getter-for-Entity-Invulnerability.patch

@@ -1,4 +1,4 @@
-From 911bff8868dbc891c52f90603a351bcf404411fa Mon Sep 17 00:00:00 2001
+From 7f5a1162b0c6e5aa7f09eee83fe338d0bbc2bd5c Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sat, 3 Aug 2013 19:53:48 +1000
 Subject: [PATCH] Add Getter for Entity Invulnerability

CraftBukkit-Patches/0052-Guard-entity-list.patch

@@ -1,11 +1,11 @@
-From 18f5248e3fc125f68b9b76f3c97e8cd70db0a386 Mon Sep 17 00:00:00 2001
+From 56244d1e05fdd71631bfbab9f0962f6658ab7658 Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Sat, 3 Aug 2013 21:42:00 +0500
 Subject: [PATCH] Guard entity list
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ae93c2d..04f5ed1 100644
+index 7cded7b..b990081 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,7 +30,25 @@ import org.bukkit.event.weather.ThunderChangeEvent;
@@ -43,7 +43,7 @@ index ae93c2d..04f5ed1 100644
      protected final gnu.trove.map.hash.TLongShortHashMap chunkTickList;
      protected float growthOdds = 100;
      protected float modifiedOdds = 100;
-@@ -1263,6 +1282,7 @@ public abstract class World implements IBlockAccess {
+@@ -1262,6 +1281,7 @@ public abstract class World implements IBlockAccess {
  
          org.spigotmc.ActivationRange.activateEntities(this); // Spigot
          timings.entityTick.startTiming(); // Spigot
@@ -51,7 +51,7 @@ index ae93c2d..04f5ed1 100644
          for (i = 0; i < this.entityList.size(); ++i) {
              entity = (Entity) this.entityList.get(i);
  
-@@ -1310,12 +1330,15 @@ public abstract class World implements IBlockAccess {
+@@ -1309,12 +1329,15 @@ public abstract class World implements IBlockAccess {
                      this.getChunkAt(j, k).b(entity);
                  }
  

CraftBukkit-Patches/0053-Cap-Minimum-Player-Speed.patch

@@ -1,4 +1,4 @@
-From ec413424cdbdb10bca11cde03d57e74f8314bfbc Mon Sep 17 00:00:00 2001
+From 86b48c644905556f2b90a2513dd7abc3f15176a7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 5 Aug 2013 20:17:20 +1000
 Subject: [PATCH] Cap Minimum Player Speed

CraftBukkit-Patches/0054-Update-Inventory-and-Health-for-PlayerConsumeItemEve.patch

@@ -1,4 +1,4 @@
-From 0bba6fa05a116014310b1f9ec2ed0df8a9f0c2ca Mon Sep 17 00:00:00 2001
+From bf0918a306f1d0fb0199f5636fe5ce2576dec92f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 14 Sep 2013 10:16:38 +1000
 Subject: [PATCH] Update Inventory and Health for PlayerConsumeItemEvent

CraftBukkit-Patches/0055-Call-EntityChangeBlockEvent-for-Fire-Arrows-hitting-.patch

@@ -1,4 +1,4 @@
-From 8586adc42e4b3692d487b365faa21596f20509f2 Mon Sep 17 00:00:00 2001
+From 9c945d99d4348f0203ed0b71fa65ddfe73034beb Mon Sep 17 00:00:00 2001
 From: BlackHole <black-hole@live.com>
 Date: Tue, 16 Jul 2013 22:34:50 +0200
 Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT

CraftBukkit-Patches/0056-Allow-Disabling-of-1.6.3-Structure-Saving.patch

@@ -1,4 +1,4 @@
-From 89f7725a6f06c7e2b7116787aacce2bb5a53d6cf Mon Sep 17 00:00:00 2001
+From 5028a69b31c0c137f07b7370bc3909863114d2ec Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 21 Sep 2013 12:33:09 +1000
 Subject: [PATCH] Allow Disabling of 1.6.3 Structure Saving
@@ -25,10 +25,10 @@ index 1eb87ae..b3c8101 100644
                  this.e = new PersistentStructure(this.a());
                  world.a(this.a(), (PersistentBase) this.e);
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 1422e38..43e8958 100644
+index eb118c6..a4cdc7a 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -206,4 +206,16 @@ public class SpigotWorldConfig
+@@ -180,4 +180,16 @@ public class SpigotWorldConfig
          randomLightUpdates = getBoolean( "random-light-updates", false );
          log( "Random Lighting Updates: " + randomLightUpdates );
      }

CraftBukkit-Patches/0057-Item-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From f5a7fb1c934205ffe0072cb8a92b0587be5c54f3 Mon Sep 17 00:00:00 2001
+From dd97988482153593f5788d10eeb33aa044814843 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 22 Sep 2013 19:10:53 +1000
 Subject: [PATCH] Item Despawn Rate
@@ -18,10 +18,10 @@ index 08b9ac8..8ea7abc 100644
                  if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
                      this.age = 0;
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 43e8958..6e024bf 100644
+index a4cdc7a..0b4e527 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -218,4 +218,11 @@ public class SpigotWorldConfig
+@@ -192,4 +192,11 @@ public class SpigotWorldConfig
              log( "*** WARNING *** Please use this option with caution, SpigotMC is not responsible for any issues this option may cause in the future!" );
          }
      }

CraftBukkit-Patches/0058-Don-t-Special-Case-X-Move-Value.patch

@@ -1,4 +1,4 @@
-From 754d901ff46068af559a0e6c477c669755613793 Mon Sep 17 00:00:00 2001
+From 9012deaaf0fe945dba34bbcdc8f720d76aa89c94 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 6 Oct 2013 17:36:28 +1100
 Subject: [PATCH] Don't Special Case X Move Value

CraftBukkit-Patches/0059-Implement-respawn-API.patch

@@ -1,4 +1,4 @@
-From 460ba26577fc8849d77714c3658076825c356f7d Mon Sep 17 00:00:00 2001
+From e5341b42a62c7f139ac3eedbb0c50c0bbfec5cfc Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.

CraftBukkit-Patches/0060-Fix-BrewingStands-Removing-NBT-Potions.patch

@@ -1,4 +1,4 @@
-From 198a55b2c2445028ebf22b701f559df657e070cf Mon Sep 17 00:00:00 2001
+From af1c05469d9f3f6033f8da3e476be4cf2a5ba957 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Wed, 9 Oct 2013 18:20:05 +1100
 Subject: [PATCH] Fix BrewingStands Removing NBT / Potions

CraftBukkit-Patches/0061-Arrow-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From d675dfb9cc936fd5284cba03d4db1c19705b4123 Mon Sep 17 00:00:00 2001
+From 25863dd229b23ef3052c3373fc8af4d94a1a3c76 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 14 Oct 2013 19:20:10 +1100
 Subject: [PATCH] Arrow Despawn Rate
@@ -18,10 +18,10 @@ index 3fd3de9..a49519b 100644
                  }
              } else {
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 6e024bf..4f406b0 100644
+index 0b4e527..447581d 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-@@ -225,4 +225,11 @@ public class SpigotWorldConfig
+@@ -199,4 +199,11 @@ public class SpigotWorldConfig
          itemDespawnRate = getInt( "item-despawn-rate", 6000 );
          log( "Item Despawn Rate: " + itemDespawnRate );
      }

CraftBukkit-Patches/0062-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From e4e75d2de2b836b93a907e7e216362474e700601 Mon Sep 17 00:00:00 2001
+From a34414532e3cea8d346427482b49fea87d2744ac Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.
@@ -144,7 +144,7 @@ index 0000000..a8840c9
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 2420570..3039634 100644
+index 7c07142..801b071 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -173,4 +173,18 @@ public class SpigotConfig

CraftBukkit-Patches/0063-Fix-packed-ice-generation.patch

@@ -1,4 +1,4 @@
-From 625edcfc95e389fb79b6fe5aa28543285be8065b Mon Sep 17 00:00:00 2001
+From d3254c1364eb10e749503c673657cb1219c6bc76 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 17:52:14 +1100
 Subject: [PATCH] Fix packed ice generation

CraftBukkit-Patches/0064-BungeeCord-Support.patch

@@ -1,4 +1,4 @@
-From b11af60198e1cf24cacc156876794fda7aaa2d72 Mon Sep 17 00:00:00 2001
+From 731b79cac5a62b1916cec175dddb9d7ab821e44a Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 1 Dec 2013 18:18:41 +1100
 Subject: [PATCH] BungeeCord Support

CraftBukkit-Patches/0065-Fix-links-in-chat.patch

@@ -1,4 +1,4 @@
-From e36d608f7f0a8fc2ea06b381311a394f8d6ed123 Mon Sep 17 00:00:00 2001
+From 4f9961ad971e3355f5ec6ad1a760f76a355ac299 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <purggames@gmail.com>
 Date: Sun, 1 Dec 2013 10:33:55 +0000
 Subject: [PATCH] Fix links in chat
@@ -100,5 +100,5 @@ index cc8e715..5607df1 100644
              IChatBaseComponent addition = new ChatComponentText(builder.toString()).setChatModifier(modifier);
              builder = new StringBuilder();
 -- 
-1.8.4.msysgit.0
+1.8.3.2
 

CraftBukkit-Patches/0066-Clear-Flower-Pot-on-Drop.patch

@@ -1,4 +1,4 @@
-From 4b9b05f7b6bca31e432146d65e4490fd58e74bf0 Mon Sep 17 00:00:00 2001
+From e0291e8477c3d29eb8f18324789bf6031175237f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 3 Dec 2013 11:07:48 +1100
 Subject: [PATCH] Clear Flower Pot on Drop

CraftBukkit-Patches/0067-Fix-some-chunks-not-being-sent-to-the-client.patch

@@ -1,4 +1,4 @@
-From 66759d37f4c77df5775fd60ab597bdf2c1ce875f Mon Sep 17 00:00:00 2001
+From b3f0aa27d0f07c6b3a558cf68c5248338ddc4ff2 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Mon, 2 Dec 2013 23:42:09 +0000
 Subject: [PATCH] Fix some chunks not being sent to the client

CraftBukkit-Patches/0068-Fix-Broken-Async-Chat.patch

@@ -1,4 +1,4 @@
-From c3ad3cf798fbaeb93937357fc0e5658811bd3497 Mon Sep 17 00:00:00 2001
+From 57a94d39fba4e718dde09e89889c0869d2927870 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 5 Dec 2013 13:55:53 +1100
 Subject: [PATCH] Fix Broken Async Chat

CraftBukkit-Patches/0069-Allow-Teleportation-of-Vehicles-and-Passengers.patch

@@ -1,4 +1,4 @@
-From 09137dad16ba7ffde169c2d62dd001e7079b0886 Mon Sep 17 00:00:00 2001
+From 33647977dac8872095545e0835cda867fa1fadad Mon Sep 17 00:00:00 2001
 From: ItsHarry <info@itsjerryandharry.com>
 Date: Thu, 5 Dec 2013 21:58:11 +0100
 Subject: [PATCH] Allow Teleportation of Vehicles and Passengers

CraftBukkit-Patches/0070-Remove-OS-X-Special-Chars-from-Signs.patch

@@ -1,4 +1,4 @@
-From 1483400397a54cfdf2e32b84db55a27454107e88 Mon Sep 17 00:00:00 2001
+From 51de2389798d132adf7dee48679106e330af84bc Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 8 Dec 2013 16:52:42 +1100
 Subject: [PATCH] Remove OS X Special Chars from Signs

CraftBukkit-Patches/0071-Fix-Jungle-Tree-Generation.patch

@@ -1,4 +1,4 @@
-From 01571ab0b2a79558d1fb85e9a4bbd9db4ad86f75 Mon Sep 17 00:00:00 2001
+From 51c0917dc84e00dc6d81614b6b6513b6f8a2c1f6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 6 Dec 2013 17:16:32 +1100
 Subject: [PATCH] Fix Jungle Tree Generation

CraftBukkit-Patches/0072-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From a4d9f4610e157581f83016c4f3a46396c47cf0f3 Mon Sep 17 00:00:00 2001
+From 0aa2dc80f6bb2afd62e23f03f43beca2a1a78cee 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
@@ -37,7 +37,7 @@ index 39e5b5b..d2587c1 100644
                      double d0 = (double) ((float) i + this.world.random.nextFloat());
                      double d1 = (double) ((float) j + this.world.random.nextFloat());
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 856e825..7169ec8 100644
+index 09b34e9..3006712 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -28,6 +28,7 @@ public class PacketPlayOutMapChunk extends Packet {
@@ -49,7 +49,7 @@ index 856e825..7169ec8 100644
          try {
              this.buffer = chunkmap.a;
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java
-index 3eac231..785953e 100644
+index bf3a139..30bf8a7 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunkBulk.java
 @@ -26,6 +26,7 @@ public class PacketPlayOutMapChunkBulk extends Packet {
@@ -115,10 +115,10 @@ index bceba7b..c963fac 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5cfcc6c..3e41e82 100644
+index b990081..04f5ed1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -471,6 +471,7 @@ public abstract class World implements IBlockAccess {
+@@ -490,6 +490,7 @@ public abstract class World implements IBlockAccess {
          this.e(i, j + 1, k, block);
          this.e(i, j, k - 1, block);
          this.e(i, j, k + 1, block);
@@ -337,7 +337,7 @@ index 0000000..6413ac0
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 97d56bd..3a4f338 100644
+index 447581d..b4d9fc0 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -1,5 +1,6 @@
@@ -347,9 +347,9 @@ index 97d56bd..3a4f338 100644
  import java.util.List;
  import org.bukkit.Bukkit;
  import org.bukkit.configuration.file.YamlConfiguration;
-@@ -127,4 +128,29 @@ public class SpigotWorldConfig
+@@ -206,4 +207,29 @@ public class SpigotWorldConfig
-         viewDistance = getInt( "view-distance", Bukkit.getViewDistance() );
+         arrowDespawnRate = getInt( "arrow-despawn-rate", 1200  );
-         log( "View Distance: " + viewDistance );
+         log( "Arrow Despawn Rate: " + arrowDespawnRate );
      }
 +    
 +    public boolean antiXray = true;
@@ -378,5 +378,5 @@ index 97d56bd..3a4f338 100644
 +    }
  }
 -- 
-1.8.4.msysgit.0
+1.8.3.2