Update to 1.7.5

By: Thinkofdeath <thethinkofdeath@gmail.com>

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

@@ -1,4 +1,4 @@
-From 58c5ce437abf82cbde87209dc095c6574c9e6d9c Mon Sep 17 00:00:00 2001
+From 41e82cb66847e6ecbcd1406cb621eb2bdcbb4a3d 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 ff07aa7..adf20d9 100644
+index 491ef6b..4bcd57e 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 {
+@@ -89,7 +89,7 @@ public abstract class Entity {
      public int ticksLived;
      public int maxFireTicks;
      public int fireTicks; // CraftBukkit - private -> public
@@ -21,7 +21,7 @@ index ff07aa7..adf20d9 100644
      public int noDamageTicks;
      private boolean justCreated;
      protected boolean fireProof;
-@@ -112,7 +112,13 @@ public abstract class Entity {
+@@ -113,7 +113,13 @@ public abstract class Entity {
      public boolean valid; // CraftBukkit
      public org.bukkit.projectiles.ProjectileSource projectileSource; // CraftBukkit - For projectiles only
  
@@ -35,7 +35,7 @@ index ff07aa7..adf20d9 100644
  
      public int getId() {
          return this.id;
-@@ -139,7 +145,12 @@ public abstract class Entity {
+@@ -140,7 +146,12 @@ public abstract class Entity {
          this.setPosition(0.0D, 0.0D, 0.0D);
          if (world != null) {
              this.dimension = world.worldProvider.dimension;
@@ -85,7 +85,7 @@ index 36ed831..7ddca48 100644
          super(world);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 5887ee8..367bcc9 100644
+index b263d82..c33d564 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -15,7 +15,7 @@ public class EntityArrow extends Entity implements IProjectile {
@@ -98,7 +98,7 @@ index 5887ee8..367bcc9 100644
      public int shake;
      public Entity shooter;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 7211da8..d06ec7b 100644
+index af5deb9..57157ef 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -78,6 +78,13 @@ public abstract class EntityLiving extends Entity {
@@ -116,10 +116,10 @@ index 7211da8..d06ec7b 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 99345a1..58eacd2 100644
+index 9b3f3e5..a2ca914 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1243,6 +1243,7 @@ public abstract class World implements IBlockAccess {
+@@ -1240,6 +1240,7 @@ public abstract class World implements IBlockAccess {
          this.f.clear();
          this.methodProfiler.c("regular");
  
@@ -127,7 +127,7 @@ index 99345a1..58eacd2 100644
          timings.entityTick.startTiming(); // Spigot
          // CraftBukkit start - Use field for loop variable
          for (this.tickPosition = 0; this.tickPosition < this.entityList.size(); ++this.tickPosition) {
-@@ -1404,7 +1405,11 @@ public abstract class World implements IBlockAccess {
+@@ -1401,7 +1402,11 @@ public abstract class World implements IBlockAccess {
          int j = MathHelper.floor(entity.locZ);
          byte b0 = 32;
  
@@ -138,8 +138,8 @@ index 99345a1..58eacd2 100644
 +            entity.inactiveTick();
 +        } else {
              entity.tickTimer.startTiming(); // Spigot
-             entity.T = entity.locX;
-             entity.U = entity.locY;
+             entity.S = entity.locX;
+             entity.T = entity.locY;
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 index 8340c13..541dfe4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
@@ -156,7 +156,7 @@ index 8340c13..541dfe4 100644
      public static final HashMap<String, CustomTimingsHandler> pluginTaskTimingMap = new HashMap<String, CustomTimingsHandler>();
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
 new file mode 100644
-index 0000000..db4c927
+index 0000000..06284ad
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -0,0 +1,296 @@
@@ -403,7 +403,7 @@ index 0000000..db4c927
 +            if ( entity instanceof EntityAnimal )
 +            {
 +                EntityAnimal animal = (EntityAnimal) entity;
-+                if ( animal.isBaby() || animal.cc() /*love*/ )
++                if ( animal.isBaby() || animal.ce() /*love*/ )
 +                {
 +                    return true;
 +                }
@@ -477,5 +477,5 @@ index 46249d7..ed2836a 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0