Minecraft 1.9.4

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-05-10 21:47:39 +10:00
parent c9a6e9175c
commit d506c12c07
236 changed files with 1471 additions and 1822 deletions

View File

@@ -2,7 +2,7 @@
+++ b/net/minecraft/server/PlayerInventory.java
@@ -3,6 +3,14 @@
import java.util.Arrays;
import java.util.concurrent.Callable;
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.List;
@@ -64,7 +64,7 @@
public PlayerInventory(EntityHuman entityhuman) {
this.g = new ItemStack[][] { this.items, this.armor, this.extraSlots};
this.player = entityhuman;
@@ -35,6 +85,22 @@
@@ -36,6 +86,22 @@
return itemstack.getItem() == itemstack1.getItem() && (!itemstack.usesData() || itemstack.getData() == itemstack1.getData()) && ItemStack.equals(itemstack, itemstack1);
}
@@ -87,7 +87,7 @@
public int getFirstEmptySlotIndex() {
for (int i = 0; i < this.items.length; ++i) {
if (this.items[i] == null) {
@@ -455,7 +521,7 @@
@@ -459,7 +525,7 @@
}
public int getMaxStackSize() {
@@ -96,9 +96,9 @@
}
public boolean b(IBlockData iblockdata) {
@@ -511,6 +577,11 @@
}
@@ -516,6 +582,11 @@
@Nullable
public ItemStack getCarried() {
+ // CraftBukkit start
+ if (this.carried != null && this.carried.count == 0) {