Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

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

@@ -1,4 +1,4 @@
-From ab979a085fe27c1d0b799b69288544965117daa3 Mon Sep 17 00:00:00 2001
+From c55d89f24822cee98493ecca99c8cf7c9a1b06f9 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,10 +9,10 @@ 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 491ef6b..4bcd57e 100644
+index d817369..0b6e9cf 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -89,7 +89,7 @@ public abstract class Entity {
+@@ -91,7 +91,7 @@ public abstract class Entity {
      public int ticksLived;
      public int maxFireTicks;
      public int fireTicks; // CraftBukkit - private -> public
@@ -21,7 +21,7 @@ index 491ef6b..4bcd57e 100644
      public int noDamageTicks;
      private boolean justCreated;
      protected boolean fireProof;
-@@ -113,7 +113,13 @@ public abstract class Entity {
+@@ -115,7 +115,13 @@ public abstract class Entity {
      public boolean valid; // CraftBukkit
      public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
  
@@ -35,7 +35,7 @@ index 491ef6b..4bcd57e 100644
  
      public int getId() {
          return this.id;
-@@ -140,7 +146,12 @@ public abstract class Entity {
+@@ -142,7 +148,12 @@ public abstract class Entity {
          this.setPosition(0.0D, 0.0D, 0.0D);
          if (world != null) {
              this.dimension = world.worldProvider.dimension;
@@ -516,5 +516,5 @@ index 46249d7..ed2836a 100644
 +    }
  }
 -- 
-1.8.5.2.msysgit.0
+1.9.1