Update to Minecraft 1.8.3

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

View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/PlayerInventory.java 2014-11-28 17:43:43.333707430 +0000
+++ src/main/java/net/minecraft/server/PlayerInventory.java 2014-11-28 17:38:21.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/PlayerInventory.java 2015-02-26 22:40:23.019608135 +0000
+++ src/main/java/net/minecraft/server/PlayerInventory.java 2015-02-26 22:40:23.023608135 +0000
@@ -2,6 +2,13 @@
import java.util.concurrent.Callable;
@@ -14,11 +14,10 @@
public class PlayerInventory implements IInventory {
public ItemStack[] items = new ItemStack[36];
@@ -10,6 +17,39 @@
public EntityHuman player;
@@ -11,6 +18,39 @@
private ItemStack f;
public boolean e;
+
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
@@ -51,14 +50,14 @@
+ maxStack = size;
+ }
+ // CraftBukkit end
+
public PlayerInventory(EntityHuman entityhuman) {
this.player = entityhuman;
@@ -42,6 +82,22 @@
}
@@ -43,6 +83,22 @@
return -1;
}
+
+ // CraftBukkit start - Watch method above! :D
+ public int canHold(ItemStack itemstack) {
+ int remains = itemstack.count;
@@ -74,10 +73,11 @@
+ return itemstack.count - remains;
+ }
+ // CraftBukkit end
+
public int getFirstEmptySlotIndex() {
for (int i = 0; i < this.items.length; ++i) {
@@ -382,7 +438,7 @@
if (this.items[i] == null) {
@@ -390,7 +446,7 @@
}
public int getMaxStackSize() {
@@ -86,7 +86,7 @@
}
public boolean b(Block block) {
@@ -458,6 +514,11 @@
@@ -466,6 +522,11 @@
}
public ItemStack getCarried() {