Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-09 18:00:58 +11:00
parent 987080283a
commit a6e7c7a91e
46 changed files with 106 additions and 401 deletions

View File

@@ -1,4 +1,4 @@
From 7209fac192b5c615586cb72bc9dd8367f27515c9 Mon Sep 17 00:00:00 2001
From aef4d944e95433be138fd0e104bbc1bced93430b 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 491d0b0..6965e82 100644
index 1a8388a..2e3597f 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1248,6 +1248,7 @@ public abstract class World implements IBlockAccess {
@@ -1254,6 +1254,7 @@ public abstract class World implements IBlockAccess {
this.f.clear();
this.methodProfiler.c("regular");
@@ -127,7 +127,7 @@ index 491d0b0..6965e82 100644
timings.entityTick.startTiming(); // Spigot
for (i = 0; i < this.entityList.size(); ++i) {
entity = (Entity) this.entityList.get(i);
@@ -1408,7 +1409,11 @@ public abstract class World implements IBlockAccess {
@@ -1414,7 +1415,11 @@ public abstract class World implements IBlockAccess {
int j = MathHelper.floor(entity.locZ);
byte b0 = 32;