Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-01-15 20:28:26 +11:00
parent e4f2987e65
commit 1180c5cc83
15 changed files with 47 additions and 47 deletions

View File

@@ -1,11 +1,11 @@
From d9860352fadbcf7ba9dc05acdfa6f57bbb3fe2e7 Mon Sep 17 00:00:00 2001
From b8be62f188026035f7ec74efda2cd18f69c9be63 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 95b4704..3bcca91 100644
index bc3dd41..10efeef 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 95b4704..3bcca91 100644
public Chunk(World world, int i, int j) {
this.sections = new ChunkSection[16];
@@ -601,6 +602,22 @@ public class Chunk {
@@ -612,6 +613,22 @@ public class Chunk {
entity.aj = k;
entity.ak = this.locZ;
this.entitySlices[k].add(entity);
@@ -39,7 +39,7 @@ index 95b4704..3bcca91 100644
}
public void b(Entity entity) {
@@ -617,6 +634,22 @@ public class Chunk {
@@ -628,6 +645,22 @@ public class Chunk {
}
this.entitySlices[i].remove(entity);