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 3bccc2c884c6ebf06e146c254577a772188c2025 Mon Sep 17 00:00:00 2001
From e70f120999ce4597e539407cf4d83a1e56d941f4 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 3 Feb 2013 09:20:19 +1100
Subject: [PATCH] Handle Null Tile Entities
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index fde1939..491d0b0 100644
index 3e41e82..1a8388a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1306,6 +1306,13 @@ public abstract class World implements IBlockAccess {
@@ -1312,6 +1312,13 @@ public abstract class World implements IBlockAccess {
while (iterator.hasNext()) {
TileEntity tileentity = (TileEntity) iterator.next();