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,14 +1,14 @@
From 09ad256fbf9cad5e589858bcd58d7d5f63759163 Mon Sep 17 00:00:00 2001
From 90c7728aa37e43c8710c2821790405763d9bd92e Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Wed, 16 Jan 2013 15:27:22 -0600
Subject: [PATCH] Sync Free Chunk Reference Cache
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5b9c6ec..75fed94 100644
index aca2455..e580460 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -291,20 +291,18 @@ public abstract class World implements IBlockAccess {
@@ -292,20 +292,18 @@ public abstract class World implements IBlockAccess {
return this.getChunkAt(i >> 4, j >> 4);
}