Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-03 15:13:39 +11:00
parent 223fa04f6f
commit 739f396eba
17 changed files with 69 additions and 173 deletions

View File

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