Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to rename revision 02

Browse Source
This commit is contained in:
Erik Broes
2012-02-29 22:31:04 +01:00
committed by Nathan Adams
parent 8524ff8ef7
commit 33ba9f0a2f
100 changed files with 772 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/net/minecraft/server/PlayerInventory.java
View File

@@ -14,13 +14,13 @@ public class PlayerInventory implements IInventory {
public ItemStack[] items = new ItemStack[36];
public ItemStack[] armor = new ItemStack[4];
public int itemInHandIndex = 0;
public EntityHuman d;
public EntityHuman player;
private ItemStack f;
public boolean e = false;
// CraftBukkit start
public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public ItemStack[] getContents() {
return this.items;
}
@@ -36,18 +36,18 @@ public class PlayerInventory implements IInventory {
public void onClose(CraftHumanEntity who) {
transaction.remove(who);
}
public List<HumanEntity> getViewers() {
return transaction;
}
public InventoryHolder getOwner() {
return d.getBukkitEntity();
return this.player.getBukkitEntity();
}
// CraftBukkit end
public PlayerInventory(EntityHuman entityhuman) {
this.d = entityhuman;
this.player = entityhuman;
}
public ItemStack getItemInHand() {
@@ -161,7 +161,7 @@ public class PlayerInventory implements IInventory {
public void i() {
for (int i = 0; i < this.items.length; ++i) {
if (this.items[i] != null) {
this.items[i].a(this.d.world, this.d, i, this.itemInHandIndex == i);
this.items[i].a(this.player.world, this.player, i, this.itemInHandIndex == i);
}
}
}
@@ -196,7 +196,7 @@ public class PlayerInventory implements IInventory {
this.items[i].b = 5;
itemstack.count = 0;
return true;
} else if (this.d.abilities.canInstantlyBuild) {
} else if (this.player.abilities.canInstantlyBuild) {
itemstack.count = 0;
return true;
} else {
@@ -208,7 +208,7 @@ public class PlayerInventory implements IInventory {
itemstack.count = this.e(itemstack);
} while (itemstack.count > 0 && itemstack.count < i);
if (itemstack.count == i && this.d.abilities.canInstantlyBuild) {
if (itemstack.count == i && this.player.abilities.canInstantlyBuild) {
itemstack.count = 0;
return true;
} else {
@@ -274,7 +274,7 @@ public class PlayerInventory implements IInventory {
if (this.items[i] != null) {
nbttagcompound = new NBTTagCompound();
nbttagcompound.setByte("Slot", (byte) i);
this.items[i].b(nbttagcompound);
this.items[i].save(nbttagcompound);
nbttaglist.add(nbttagcompound);
}
}
@@ -283,7 +283,7 @@ public class PlayerInventory implements IInventory {
if (this.armor[i] != null) {
nbttagcompound = new NBTTagCompound();
nbttagcompound.setByte("Slot", (byte) (i + 100));
this.armor[i].b(nbttagcompound);
this.armor[i].save(nbttagcompound);
nbttaglist.add(nbttagcompound);
}
}
@@ -348,7 +348,7 @@ public class PlayerInventory implements IInventory {
}
// CraftBukkit end
if (block.material.k()) {
if (block.material.isAlwaysDestroyable()) {
return true;
} else {
ItemStack itemstack = this.getItem(this.itemInHandIndex);
@@ -379,9 +379,9 @@ public class PlayerInventory implements IInventory {
for (int j = 0; j < this.armor.length; ++j) {
if (this.armor[j] != null && this.armor[j].getItem() instanceof ItemArmor) {
this.armor[j].damage(i, this.d);
this.armor[j].damage(i, this.player);
if (this.armor[j].count == 0) {
this.armor[j].a(this.d);
this.armor[j].a(this.player);
this.armor[j] = null;
}
}
@@ -393,14 +393,14 @@ public class PlayerInventory implements IInventory {
for (i = 0; i < this.items.length; ++i) {
if (this.items[i] != null) {
this.d.a(this.items[i], true);
this.player.a(this.items[i], true);
this.items[i] = null;
}
}
for (i = 0; i < this.armor.length; ++i) {
if (this.armor[i] != null) {
this.d.a(this.armor[i], true);
this.player.a(this.armor[i], true);
this.armor[i] = null;
}
}
@@ -410,17 +410,17 @@ public class PlayerInventory implements IInventory {
this.e = true;
}
public void b(ItemStack itemstack) {
public void setCarried(ItemStack itemstack) {
this.f = itemstack;
this.d.a(itemstack);
this.player.carriedChanged(itemstack);
}
public ItemStack l() {
public ItemStack getCarried() {
return this.f;
}
public boolean a(EntityHuman entityhuman) {
return this.d.dead ? false : entityhuman.i(this.d) <= 64.0D;
return this.player.dead ? false : entityhuman.i(this.player) <= 64.0D;
}
public boolean c(ItemStack itemstack) {