SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge, lots of conflicts

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-06-22 19:25:10 +10:00
parent 07a1436667
commit 9ab31295a9
120 changed files with 252 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0015-Fix-Mob-Spawning-Relative-to-View-Distance.patch
View File

@@ -1,11 +1,11 @@
From e71213a20ac3894089923747de1bf84f672beb31 Mon Sep 17 00:00:00 2001
From ad6096243ee953cfd0208b1d9aaef93122d95a12 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 ade0c35..1ac9804 100644
index d770e4e..39767d0 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 {
@@ -14,9 +14,9 @@ index ade0c35..1ac9804 100644
private int x;
+ protected net.minecraft.util.gnu.trove.map.hash.TObjectIntHashMap<Class> entityCount = new net.minecraft.util.gnu.trove.map.hash.TObjectIntHashMap<Class>(); // Spigot
public Chunk(World world, int i, int j) {
this.sections = new ChunkSection[16];
@@ -607,6 +608,22 @@ public class Chunk {
// CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking
private int neighbors = 0x1 << 12;
@@ -635,6 +636,22 @@ public class Chunk {
entity.ai = k;
entity.aj = this.locZ;
this.entitySlices[k].add(entity);
@@ -39,7 +39,7 @@ index ade0c35..1ac9804 100644
}
public void b(Entity entity) {
@@ -623,6 +640,22 @@ public class Chunk {
@@ -651,6 +668,22 @@ public class Chunk {
}
this.entitySlices[i].remove(entity);