summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityHuman.java
diff options
context:
space:
mode:
authorCeltic Minstrel <celtic.minstrel.ca@some.place>2012-02-29 13:56:35 -0500
committerEvilSeph <evilseph@gmail.com>2012-02-29 15:19:07 -0500
commit0842bab48b1c24f113c61606a294f5bcdf2e1315 (patch)
treee10864f22a8c54129d4e670ec15b8da594c333eb /src/main/java/net/minecraft/server/EntityHuman.java
parent10e593649c224db2f0a4227bdf6eef44bfa16865 (diff)
downloadcraftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar
craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar.gz
craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar.lz
craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.tar.xz
craftbukkit-0842bab48b1c24f113c61606a294f5bcdf2e1315.zip
[Bleeding] Implementation of inventory framework. Addresses BUKKIT-856
See the corresponding Bukkit commit for details. Implementation details: - Any packets that include an itemstack will send air stacks as null; maybe this will even eliminate the client crash that occurs if the client receives an air stack - Better handling of null itemstacks in general (ie less converting them to air stacks) - Inventory.setContents() can now take an array smaller than the inventory without error - Player.updateInventory() should now correctly update the result slot in a crafting inventory Some small credit goes to Afforess (initial implementation of openInventory() methods) and Drakia (initial implementation of InventoryOpenEvent and InventoryCloseEvent).
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityHuman.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityHuman.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 00e32df1..6bd02280 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -7,6 +7,7 @@ import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.entity.CraftItem;
import org.bukkit.craftbukkit.TrigMath;
+import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.event.entity.EntityCombustByEntityEvent;
@@ -261,7 +262,8 @@ public abstract class EntityHuman extends EntityLiving {
return this.getHealth() <= 0 || this.isSleeping();
}
- protected void closeInventory() {
+ // CraftBukkit - protected -> public
+ public void closeInventory() {
this.activeContainer = this.defaultContainer;
}
@@ -1283,4 +1285,10 @@ public abstract class EntityHuman extends EntityLiving {
this.exp = entityhuman.exp;
this.q = entityhuman.q;
}
+
+ // CraftBukkit start
+ public HumanEntity getBukkitEntity() {
+ return (HumanEntity) super.getBukkitEntity();
+ }
+ // CraftBukkit end
}