3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-27 00:22:46 +01:00
Paper/nms-patches/TileEntityShulkerBox.patch

68 Zeilen
2.5 KiB
Diff

2016-11-17 02:41:03 +01:00
--- a/net/minecraft/server/TileEntityShulkerBox.java
+++ b/net/minecraft/server/TileEntityShulkerBox.java
2020-08-11 23:00:00 +02:00
@@ -3,6 +3,10 @@
2016-11-17 02:41:03 +01:00
import java.util.List;
2018-07-15 02:00:00 +02:00
import java.util.stream.IntStream;
2016-11-17 02:41:03 +01:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.entity.HumanEntity;
+// CraftBukkit end
2018-07-15 02:00:00 +02:00
public class TileEntityShulkerBox extends TileEntityLootable implements IWorldInventory, ITickable {
2016-11-17 02:41:03 +01:00
@@ -16,6 +20,37 @@
2019-04-23 04:00:00 +02:00
private EnumColor l;
private boolean m;
2016-11-17 02:41:03 +01:00
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
+ public boolean opened;
2016-11-17 02:41:03 +01:00
+
+ public List<ItemStack> getContents() {
2019-04-23 04:00:00 +02:00
+ return this.contents;
2016-11-17 02:41:03 +01:00
+ }
+
+ public void onOpen(CraftHumanEntity who) {
+ transaction.add(who);
+ }
+
+ public void onClose(CraftHumanEntity who) {
+ transaction.remove(who);
+ }
+
+ public List<HumanEntity> getViewers() {
+ return transaction;
+ }
+
2019-04-23 04:00:00 +02:00
+ @Override
+ public int getMaxStackSize() {
+ return maxStack;
+ }
+
2016-11-17 02:41:03 +01:00
+ public void setMaxStackSize(int size) {
+ maxStack = size;
+ }
+ // CraftBukkit end
+
2018-07-15 02:00:00 +02:00
public TileEntityShulkerBox(@Nullable EnumColor enumcolor) {
2018-08-26 04:00:00 +02:00
super(TileEntityTypes.SHULKER_BOX);
2020-06-25 02:00:00 +02:00
this.contents = NonNullList.a(27, ItemStack.b);
@@ -178,6 +213,7 @@
}
2020-08-11 23:00:00 +02:00
++this.viewingCount;
+ if (opened) return; // CraftBukkit - only animate if the ShulkerBox hasn't been forced open already by an API call.
2020-08-11 23:00:00 +02:00
this.world.playBlockAction(this.position, this.getBlock().getBlock(), 1, this.viewingCount);
if (this.viewingCount == 1) {
this.world.playSound((EntityHuman) null, this.position, SoundEffects.BLOCK_SHULKER_BOX_OPEN, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);
@@ -190,6 +226,7 @@
public void closeContainer(EntityHuman entityhuman) {
if (!entityhuman.isSpectator()) {
2020-08-11 23:00:00 +02:00
--this.viewingCount;
+ if (opened) return; // CraftBukkit - only animate if the ShulkerBox hasn't been forced open already by an API call.
2020-08-11 23:00:00 +02:00
this.world.playBlockAction(this.position, this.getBlock().getBlock(), 1, this.viewingCount);
if (this.viewingCount <= 0) {
this.world.playSound((EntityHuman) null, this.position, SoundEffects.BLOCK_SHULKER_BOX_CLOSE, SoundCategory.BLOCKS, 0.5F, this.world.random.nextFloat() * 0.1F + 0.9F);