PaperMC/nms-patches/EntityMinecartContainer.patch

82 lines
2.4 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityMinecartContainer.java
+++ b/net/minecraft/server/EntityMinecartContainer.java
2018-08-12 10:39:51 +02:00
@@ -3,23 +3,66 @@
2016-11-17 02:41:03 +01:00
import java.util.Iterator;
2016-02-29 22:32:46 +01:00
import java.util.Random;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import java.util.List;
2016-05-10 13:47:39 +02:00
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.InventoryHolder;
+// CraftBukkit end
2016-02-29 22:32:46 +01:00
public abstract class EntityMinecartContainer extends EntityMinecartAbstract implements ITileInventory, ILootable {
2018-08-12 10:39:51 +02:00
private NonNullList<ItemStack> items;
private boolean b;
2016-02-29 22:32:46 +01:00
private MinecraftKey c;
2018-08-12 10:39:51 +02:00
- private long d;
+ public long d; // CraftBukkit private -> public
+
+ // CraftBukkit start
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
+
2016-11-17 02:41:03 +01:00
+ public List<ItemStack> getContents() {
+ return this.items;
+ }
+
+ public void onOpen(CraftHumanEntity who) {
+ transaction.add(who);
+ }
+
+ public void onClose(CraftHumanEntity who) {
+ transaction.remove(who);
+ }
+
+ public List<HumanEntity> getViewers() {
+ return transaction;
+ }
+
+ public InventoryHolder getOwner() {
+ org.bukkit.entity.Entity cart = getBukkitEntity();
+ if(cart instanceof InventoryHolder) return (InventoryHolder) cart;
+ return null;
+ }
+
+ public void setMaxStackSize(int size) {
+ maxStack = size;
+ }
2016-05-10 13:47:39 +02:00
+
+ @Override
+ public Location getLocation() {
+ return getBukkitEntity().getLocation();
+ }
+ // CraftBukkit end
2018-08-12 10:39:51 +02:00
2018-07-15 02:00:00 +02:00
protected EntityMinecartContainer(EntityTypes<?> entitytypes, World world) {
super(entitytypes, world);
- this.items = NonNullList.a(36, ItemStack.a);
+ this.items = NonNullList.a(this.getSize(), ItemStack.a); // CraftBukkit - SPIGOT-3513
this.b = true;
}
2018-07-15 02:00:00 +02:00
protected EntityMinecartContainer(EntityTypes<?> entitytypes, double d0, double d1, double d2, World world) {
super(entitytypes, world, d0, d1, d2);
- this.items = NonNullList.a(36, ItemStack.a);
+ this.items = NonNullList.a(this.getSize(), ItemStack.a); // CraftBukkit - SPIGOT-3513
this.b = true;
}
2018-07-22 04:00:00 +02:00
@@ -102,7 +145,7 @@
}
public int getMaxStackSize() {
- return 64;
+ return maxStack; // CraftBukkit
}
2016-05-10 13:47:39 +02:00
@Nullable