Update to Minecraft 1.9

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-03-01 08:32:46 +11:00
parent 2da480a9c8
commit 21d4bf5d1f
305 changed files with 6684 additions and 6105 deletions

View File

@@ -1,11 +1,12 @@
--- a/net/minecraft/server/InventorySubcontainer.java
+++ b/net/minecraft/server/InventorySubcontainer.java
@@ -3,6 +3,12 @@
@@ -3,6 +3,13 @@
import com.google.common.collect.Lists;
import java.util.List;
+// CraftBukkit start
+import java.util.List;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
@@ -13,7 +14,7 @@
public class InventorySubcontainer implements IInventory {
private String a;
@@ -11,7 +17,42 @@
@@ -11,7 +18,47 @@
private List<IInventoryListener> d;
private boolean e;
@@ -45,6 +46,11 @@
+ public org.bukkit.inventory.InventoryHolder getOwner() {
+ return bukkitOwner;
+ }
+
+ @Override
+ public Location getLocation() {
+ return null;
+ }
+
public InventorySubcontainer(String s, boolean flag, int i) {
+ this(s, flag, i, null);