SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#660: Add support to change block's lid state

Browse Source 
By: jameslfc19 <jameslfc19@gmail.com>
This commit is contained in:
CraftBukkit/Spigot
2020-07-29 19:41:00 +10:00
parent a9f92a7086
commit c555653b93
6 changed files with 165 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
paper-server/nms-patches/TileEntityChest.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/TileEntityChest.java
+++ b/net/minecraft/server/TileEntityChest.java
@@ -2,6 +2,10 @@
@@ -2,15 +2,50 @@
import java.util.Iterator;
import java.util.List;
@@ -11,13 +11,17 @@
public class TileEntityChest extends TileEntityLootable implements ITickable {
@@ -11,6 +15,36 @@
protected int viewingCount;
private NonNullList<ItemStack> items;
protected float a;
protected float b;
- protected int viewingCount;
+ public int viewingCount; // PAIL protected -> public
private int j;
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
+ public boolean opened;
+
+ public List<ItemStack> getContents() {
+ return this.items;
@@ -48,7 +52,30 @@
protected TileEntityChest(TileEntityTypes<?> tileentitytypes) {
super(tileentitytypes);
this.items = NonNullList.a(27, ItemStack.b);
@@ -155,8 +189,20 @@
@@ -61,6 +96,13 @@
this.b = this.a;
float f = 0.1F;
+ // CraftBukkit start - If chest is forced open by API, remove a viewer due to playBlockAction() call and don't tick to prevent sound effects.
+ if (opened) {
+ this.viewingCount--;
+ return;
+ }
+ // CraftBukkit end
+
if (this.viewingCount > 0 && this.a == 0.0F) {
this.a(SoundEffects.BLOCK_CHEST_OPEN);
}
@@ -120,7 +162,7 @@
return l;
}
- private void a(SoundEffect soundeffect) {
+ public void a(SoundEffect soundeffect) { // PAIL private -> public, rename playSound
BlockPropertyChestType blockpropertychesttype = (BlockPropertyChestType) this.getBlock().get(BlockChest.c);
if (blockpropertychesttype != BlockPropertyChestType.LEFT) {
@@ -155,8 +197,20 @@
if (this.viewingCount < 0) {
this.viewingCount = 0;
}
@@ -69,7 +96,7 @@
this.onOpen();
}
@@ -165,7 +211,18 @@
@@ -165,7 +219,18 @@
@Override
public void closeContainer(EntityHuman entityhuman) {
if (!entityhuman.isSpectator()) {
@@ -88,7 +115,16 @@
this.onOpen();
}
@@ -216,4 +273,11 @@
@@ -175,7 +240,7 @@
Block block = this.getBlock().getBlock();
if (block instanceof BlockChest) {
- this.world.playBlockAction(this.position, block, 1, this.viewingCount);
+ if (!opened) this.world.playBlockAction(this.position, block, 1, this.viewingCount); // CraftBukkit
this.world.applyPhysics(this.position, block);
}
@@ -216,4 +281,11 @@
protected Container createContainer(int i, PlayerInventory playerinventory) {
return ContainerChest.a(i, playerinventory, this);
}