summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityMinecart.java
diff options
context:
space:
mode:
authorCeltic Minstrel <celtic.minstrel.ca@some.place>2012-03-14 10:00:54 -0400
committerEvilSeph <evilseph@gmail.com>2012-03-15 22:44:10 -0400
commit5c8fd4995f2bd4817e4a822ab63a485e4abc1ab2 (patch)
treef0da8ed8ed6f0474d0863719a858692105e0fb91 /src/main/java/net/minecraft/server/EntityMinecart.java
parent66e067f37335ddb6261487744c42e4efc709d2b9 (diff)
downloadcraftbukkit-5c8fd4995f2bd4817e4a822ab63a485e4abc1ab2.tar
craftbukkit-5c8fd4995f2bd4817e4a822ab63a485e4abc1ab2.tar.gz
craftbukkit-5c8fd4995f2bd4817e4a822ab63a485e4abc1ab2.tar.lz
craftbukkit-5c8fd4995f2bd4817e4a822ab63a485e4abc1ab2.tar.xz
craftbukkit-5c8fd4995f2bd4817e4a822ab63a485e4abc1ab2.zip
[Bleeding] Implemented Inventory.{get,set}MaxStackSize(). Addresses BUKKIT-1076
- Custom inventories also respect this setting now.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityMinecart.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityMinecart.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java
index 1e2c9eae..7dfc5870 100644
--- a/src/main/java/net/minecraft/server/EntityMinecart.java
+++ b/src/main/java/net/minecraft/server/EntityMinecart.java
@@ -44,7 +44,8 @@ public class EntityMinecart extends Entity implements IInventory {
private double flyingY = 0.95;
private double flyingZ = 0.95;
public double maxSpeed = 0.4D;
- public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); // CraftBukkit
+ public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
public ItemStack[] getContents() {
return this.items;
@@ -67,6 +68,10 @@ public class EntityMinecart extends Entity implements IInventory {
if(cart instanceof InventoryHolder) return (InventoryHolder) cart;
return null;
}
+
+ public void setMaxStackSize(int size) {
+ maxStack = size;
+ }
// CraftBukkit end
public EntityMinecart(World world) {
@@ -177,7 +182,7 @@ public class EntityMinecart extends Entity implements IInventory {
itemstack.count -= k;
// CraftBukkit - include enchantments in the new itemstack
- EntityItem entityitem = new EntityItem(this.world, this.locX + (double) f, this.locY + (double) f1, this.locZ + (double) f2, new ItemStack(itemstack.id, k, itemstack.getData(), itemstack.getEnchantments()));
+ EntityItem entityitem = new EntityItem(this.world, this.locX + (double) f, this.locY + (double) f1, this.locZ + (double) f2, new ItemStack(itemstack.id, k, itemstack.getData(), itemstack.getEnchantments()));
float f3 = 0.05F;
entityitem.motX = (double) ((float) this.random.nextGaussian() * f3);
@@ -874,7 +879,7 @@ public class EntityMinecart extends Entity implements IInventory {
}
public int getMaxStackSize() {
- return 64;
+ return maxStack; // CraftBukkit
}
public void update() {}