summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/PlayerInventory.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerInventory.java')
-rw-r--r--src/main/java/net/minecraft/server/PlayerInventory.java12
1 files changed, 6 insertions, 6 deletions
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) {