twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 12:13:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.11

Browse Source
This commit is contained in:
md_5
2016-11-17 12:41:03 +11:00
parent 51263e9718
commit c25ddf063a
279 changed files with 3722 additions and 2992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nms-patches/InventorySubcontainer.patch
View File

@@ -1,8 +1,8 @@
--- a/net/minecraft/server/InventorySubcontainer.java
+++ b/net/minecraft/server/InventorySubcontainer.java
@@ -4,6 +4,13 @@
import java.util.Iterator;
import java.util.List;
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.List;
@@ -23,7 +23,7 @@
+ private int maxStack = MAX_STACK;
+ protected org.bukkit.inventory.InventoryHolder bukkitOwner;
+
+ public ItemStack[] getContents() {
+ public List<ItemStack> getContents() {
+ return this.items;
+ }
+
@@ -56,9 +56,9 @@
+ this(s, flag, i, null);
+ }
+
+ public InventorySubcontainer(String s, boolean flag, int i, org.bukkit.inventory.InventoryHolder owner) { // Added argument
+ public InventorySubcontainer(String s, boolean flag, int i, org.bukkit.inventory.InventoryHolder owner) {
+ this.bukkitOwner = owner;
+ // CraftBukkit end
+ // CraftBukkit end
this.a = s;
this.e = flag;
this.b = i;