Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-24 16:27:12 +10:00
parent a8030addd9
commit b56d35552d
78 changed files with 483 additions and 218 deletions

View File

@@ -1,11 +1,11 @@
From 2dc506017149739aad757a34429cf94162128195 Mon Sep 17 00:00:00 2001
From ce050d2da89fea40fc1459aaa5a03ba3f9e6172c Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 17:29:54 +1000
Subject: [PATCH] Fix Mob Spawning Relative to View Distance
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 771eab3..0110120 100644
index ade0c35..0eabadf 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -40,6 +40,7 @@ public class Chunk {
@@ -16,7 +16,7 @@ index 771eab3..0110120 100644
public Chunk(World world, int i, int j) {
this.sections = new ChunkSection[16];
@@ -612,6 +613,22 @@ public class Chunk {
@@ -607,6 +608,22 @@ public class Chunk {
entity.ai = k;
entity.aj = this.locZ;
this.entitySlices[k].add(entity);
@@ -39,7 +39,7 @@ index 771eab3..0110120 100644
}
public void b(Entity entity) {
@@ -628,6 +645,22 @@ public class Chunk {
@@ -623,6 +640,22 @@ public class Chunk {
}
this.entitySlices[i].remove(entity);