*correct patch

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

@@ -1,4 +1,4 @@
-From 9a7f45b5e5392a7557ad47a1f185b46e5e78f06f Mon Sep 17 00:00:00 2001
+From 33f534343e67d6e7e74240de7573806f35a1c160 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
@@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
 This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8a10948..f5203bc 100644
+index c4fa4f3..79a8329 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -88,7 +88,7 @@ public abstract class Entity {
@@ -63,7 +63,7 @@ index f46c920..1699059 100644
      public int shake = 0;
      public Entity shooter;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 51816e4..7e10318 100644
+index c547ecc..3fa7e40 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -13,6 +13,7 @@ import java.util.concurrent.Callable;
@@ -148,7 +148,7 @@ index 7d05a77..94cb855 100644
  
      public Block getBlockAt(int x, int y, int z) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index c4eea4d..4c8d1a8 100644
+index c4eea4d..3e4a0a9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -1,12 +1,43 @@
@@ -195,7 +195,7 @@ index c4eea4d..4c8d1a8 100644
      private static boolean filterIps;
  
      public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
-@@ -25,12 +56,228 @@ public class Spigot {
+@@ -25,12 +56,227 @@ public class Spigot {
          server.orebfuscatorDisabledWorlds = configuration.getStringList("orebfuscator.disabled-worlds");
          server.orebfuscatorBlocks = configuration.getShortList("orebfuscator.blocks");
          if (server.orebfuscatorEngineMode != 1 && server.orebfuscatorEngineMode != 2) {
@@ -238,7 +238,6 @@ index c4eea4d..4c8d1a8 100644
 +                || (entity.activationType == 2 && world.animalEntityActivationRange == 0)
 +                || (entity.activationType == 1 && world.monsterEntityActivationRange == 0)
 +                || entity instanceof EntityHuman
-+                || entity instanceof EntityItemFrame
 +                || entity instanceof EntityProjectile
 +                || entity instanceof EntityEnderDragon
 +                || entity instanceof EntityComplexPart

CraftBukkit-Patches/0019-Watchdog-Thread.patch

@@ -1,4 +1,4 @@
-From ffafe713302f8cb44397eaf8c794ebdfb3206914 Mon Sep 17 00:00:00 2001
+From 3b9b44f5c52fab6917df74a9a5408ca93e3ba9e9 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.
@@ -25,7 +25,7 @@ index 044db9f..d57ed7a 100644
                  this.isStopped = true;
              } catch (Throwable throwable1) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index 90237d4..3b29fea 100644
+index c81503e..c2231af 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -1,5 +1,6 @@
@@ -85,7 +85,7 @@ index 90237d4..3b29fea 100644
          server.orebfuscatorEnabled = configuration.getBoolean("orebfuscator.enable", false);
          server.orebfuscatorEngineMode = configuration.getInt("orebfuscator.engine-mode", 1);
          server.orebfuscatorUpdateRadius = configuration.getInt("orebfuscator.update-radius", 2);
-@@ -296,6 +313,66 @@ public class Spigot {
+@@ -295,6 +312,66 @@ public class Spigot {
          return isActive;
      }
  

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

@@ -1,4 +1,4 @@
-From 125f11e1ad88286af2850f90d08d5da06068b9d2 Mon Sep 17 00:00:00 2001
+From a954ac7cda5864b927a45fd250d9e4f13b496bf6 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
@@ -78,7 +78,7 @@ index 94cb855..fe7b8b0 100644
  
      public Block getBlockAt(int x, int y, int z) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
-index 3b29fea..f25852e 100644
+index c2231af..f25852e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
 @@ -16,12 +16,16 @@ import net.minecraft.server.EntityComplexPart;
@@ -98,15 +98,7 @@ index 3b29fea..f25852e 100644
  import net.minecraft.server.EntityPlayer;
  import net.minecraft.server.EntityProjectile;
  import net.minecraft.server.EntitySheep;
-@@ -127,7 +131,6 @@ public class Spigot {
+@@ -372,6 +376,32 @@ public class Spigot {
-                 || (entity.activationType == 2 && world.animalEntityActivationRange == 0)
-                 || (entity.activationType == 1 && world.monsterEntityActivationRange == 0)
-                 || entity instanceof EntityHuman
--                || entity instanceof EntityItemFrame
-                 || entity instanceof EntityProjectile
-                 || entity instanceof EntityEnderDragon
-                 || entity instanceof EntityComplexPart
-@@ -373,6 +376,32 @@ public class Spigot {
          }
      }