Update to 1.8.4

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-05-05 21:43:47 +01:00
parent ed8ca79a65
commit 38b1bb1aef
24 changed files with 270 additions and 287 deletions

View File

@@ -1,5 +1,5 @@
--- /home/matt/mc-dev-private//net/minecraft/server/TileEntityChest.java 2015-02-26 22:40:23.127608134 +0000
+++ src/main/java/net/minecraft/server/TileEntityChest.java 2015-02-26 22:40:23.127608134 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/TileEntityChest.java 2015-05-05 21:41:21.308629312 +0100
+++ src/main/java/net/minecraft/server/TileEntityChest.java 2015-05-05 21:41:21.312629253 +0100
@@ -3,6 +3,11 @@
import java.util.Iterator;
import java.util.List;
@@ -82,7 +82,7 @@
@@ -315,8 +358,20 @@
public void closeContainer(EntityHuman entityhuman) {
if (!entityhuman.v() && this.w() instanceof BlockChest) {
if (!entityhuman.isSpectator() && this.w() instanceof BlockChest) {
+ int oldPower = Math.max(0, Math.min(15, this.l)); // CraftBukkit - Get power before new viewer is added
--this.l;
+ if (this.world == null) return; // CraftBukkit