From 385ace970ee7b7912419d601b8a0867c4c2794df Mon Sep 17 00:00:00 2001
From: Nate Mortensen <nate.richard.mortensen@gmail.com>
Date: Thu, 20 Mar 2014 22:26:30 -0600
Subject: Update CraftBukkit to Minecraft 1.7.5

---
 src/main/java/net/minecraft/server/PlayerInventory.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main/java/net/minecraft/server/PlayerInventory.java')

diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java
index c9cc47ad..83cbb97c 100644
--- a/src/main/java/net/minecraft/server/PlayerInventory.java
+++ b/src/main/java/net/minecraft/server/PlayerInventory.java
@@ -18,7 +18,7 @@ public class PlayerInventory implements IInventory {
     private ItemStack g;
     public boolean e;
 
-    // CraftBukkit start
+    // CraftBukkit start - add fields and methods
     public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
     private int maxStack = MAX_STACK;
 
@@ -99,7 +99,7 @@ public class PlayerInventory implements IInventory {
     }
     // CraftBukkit end
 
-    public int j() {
+    public int getFirstEmptySlotIndex() {
         for (int i = 0; i < this.items.length; ++i) {
             if (this.items[i] == null) {
                 return i;
@@ -153,7 +153,7 @@ public class PlayerInventory implements IInventory {
         int j;
 
         if (itemstack.getMaxStackSize() == 1) {
-            j = this.j();
+            j = this.getFirstEmptySlotIndex();
             if (j < 0) {
                 return i;
             } else {
@@ -166,7 +166,7 @@ public class PlayerInventory implements IInventory {
         } else {
             j = this.firstPartial(itemstack);
             if (j < 0) {
-                j = this.j();
+                j = this.getFirstEmptySlotIndex();
             }
 
             if (j < 0) {
@@ -235,7 +235,7 @@ public class PlayerInventory implements IInventory {
                 int i;
 
                 if (itemstack.i()) {
-                    i = this.j();
+                    i = this.getFirstEmptySlotIndex();
                     if (i >= 0) {
                         this.items[i] = ItemStack.b(itemstack);
                         this.items[i].c = 5;
@@ -494,7 +494,7 @@ public class PlayerInventory implements IInventory {
     }
 
     public boolean a(EntityHuman entityhuman) {
-        return this.player.dead ? false : entityhuman.e(this.player) <= 64.0D;
+        return this.player.dead ? false : entityhuman.f(this.player) <= 64.0D;
     }
 
     public boolean c(ItemStack itemstack) {
-- 
cgit v1.2.3