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

Update to Minecraft 1.8.3

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
paper-server/nms-patches/ContainerBeacon.patch
View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/ContainerBeacon.java 2014-11-28 17:43:42.997707437 +0000
+++ src/main/java/net/minecraft/server/ContainerBeacon.java 2014-11-28 17:38:18.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/ContainerBeacon.java 2015-02-26 22:40:22.379608142 +0000
+++ src/main/java/net/minecraft/server/ContainerBeacon.java 2015-02-26 22:40:22.379608142 +0000
@@ -1,11 +1,18 @@
package net.minecraft.server;
@@ -8,7 +8,7 @@
public class ContainerBeacon extends Container {
private IInventory a;
private final SlotBeacon f;
private final ContainerBeacon.SlotBeacon f;
+ // CraftBukkit start
+ private CraftInventoryView bukkitEntity = null;
+ private PlayerInventory player;
@@ -17,9 +17,9 @@
public ContainerBeacon(IInventory iinventory, IInventory iinventory1) {
+ player = (PlayerInventory) iinventory; // CraftBukkit - TODO: check this
this.a = iinventory1;
this.a((Slot) (this.f = new SlotBeacon(this, iinventory1, 0, 136, 110)));
this.a((Slot) (this.f = new ContainerBeacon.SlotBeacon(iinventory1, 0, 136, 110)));
byte b0 = 36;
@@ -35,6 +42,7 @@
@@ -47,6 +54,7 @@
}
public boolean a(EntityHuman entityhuman) {
@@ -27,11 +27,11 @@
return this.a.a(entityhuman);
}
@@ -83,4 +91,17 @@
return itemstack;
@@ -110,4 +118,17 @@
return 1;
}
}
+
+
+ // CraftBukkit start
+ @Override
+ public CraftInventoryView getBukkitView() {