PaperMC/nms-patches/TileEntityChest.patch

107 lines
3.1 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/TileEntityChest.java
+++ b/net/minecraft/server/TileEntityChest.java
2018-07-15 02:00:00 +02:00
@@ -2,6 +2,10 @@
2016-11-17 02:41:03 +01:00
import java.util.Iterator;
import java.util.List;
+// CraftBukkit start
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
2016-11-17 02:41:03 +01:00
public class TileEntityChest extends TileEntityLootable implements ITickable {
2018-07-15 02:00:00 +02:00
@@ -11,6 +15,31 @@
protected int f;
private int k;
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start - add fields and methods
+ 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 void setMaxStackSize(int size) {
+ maxStack = size;
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2018-07-15 02:00:00 +02:00
protected TileEntityChest(TileEntityTypes<?> tileentitytypes) {
super(tileentitytypes);
2016-11-17 02:41:03 +01:00
this.items = NonNullList.a(27, ItemStack.a);
2018-07-15 02:00:00 +02:00
@@ -75,7 +104,7 @@
}
public int getMaxStackSize() {
- return 64;
+ return maxStack; // CraftBukkit
}
2018-07-22 04:00:00 +02:00
public void Y_() {
2018-07-15 02:00:00 +02:00
@@ -170,8 +199,20 @@
if (this.f < 0) {
this.f = 0;
}
2018-07-15 02:00:00 +02:00
+ int oldPower = Math.max(0, Math.min(15, this.f)); // CraftBukkit - Get power before new viewer is added
2018-07-15 02:00:00 +02:00
++this.f;
+ if (this.world == null) return; // CraftBukkit
+
+ // CraftBukkit start - Call redstone event
2016-02-29 22:32:46 +01:00
+ if (this.getBlock() == Blocks.TRAPPED_CHEST) {
2018-07-15 02:00:00 +02:00
+ int newPower = Math.max(0, Math.min(15, this.f));
+
+ if (oldPower != newPower) {
2018-07-15 02:00:00 +02:00
+ org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, position, oldPower, newPower);
+ }
+ }
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
this.p();
}
@@ -179,7 +220,18 @@
public void closeContainer(EntityHuman entityhuman) {
2018-07-15 02:00:00 +02:00
if (!entityhuman.isSpectator()) {
+ int oldPower = Math.max(0, Math.min(15, this.f)); // CraftBukkit - Get power before new viewer is added
--this.f;
2015-02-26 23:41:06 +01:00
+
+ // CraftBukkit start - Call redstone event
2018-07-15 02:00:00 +02:00
+ if (this.getBlock() == Blocks.TRAPPED_CHEST) {
+ int newPower = Math.max(0, Math.min(15, this.f));
+
+ if (oldPower != newPower) {
2018-07-15 02:00:00 +02:00
+ org.bukkit.craftbukkit.event.CraftEventFactory.callRedstoneChange(world, position, oldPower, newPower);
+ }
2018-07-15 02:00:00 +02:00
+ }
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
this.p();
}
2016-03-30 21:50:59 +02:00
2018-07-15 02:00:00 +02:00
@@ -232,4 +284,11 @@
tileentitychest.a(tileentitychest1.q());
tileentitychest1.a(nonnulllist);
2016-11-17 02:41:03 +01:00
}
+
+ // CraftBukkit start
+ @Override
2016-02-29 22:32:46 +01:00
+ public boolean isFilteredNBT() {
+ return true;
+ }
+ // CraftBukkit end
2016-11-17 02:41:03 +01:00
}