twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-20 23:03:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.15.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-01-22 08:00:00 +11:00
parent 09a2fa4d96
commit 77b64e0c78
50 changed files with 293 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
paper-server/nms-patches/BlockComposter.patch
View File

@@ -35,9 +35,9 @@
this.b = generatoraccess;
this.c = blockposition;
@@ -282,6 +285,7 @@
this.a = iblockdata;
this.b = generatoraccess;
this.c = blockposition;
this.blockData = iblockdata;
this.generatorAccess = generatoraccess;
this.blockPosition = blockposition;
+ this.bukkitOwner = new CraftBlockInventoryHolder(generatoraccess, blockposition, this); // CraftBukkit
}
@@ -46,15 +46,15 @@
@Override
public void update() {
- BlockComposter.d(this.a, this.b, this.c);
- this.d = true;
- BlockComposter.d(this.blockData, this.generatorAccess, this.blockPosition);
- this.emptied = true;
+ // CraftBukkit start - allow putting items back (eg cancelled InventoryMoveItemEvent)
+ if (this.isNotEmpty()) {
+ BlockComposter.d(this.a, this.b, this.c);
+ this.d = true;
+ if (this.isEmpty()) {
+ BlockComposter.d(this.blockData, this.generatorAccess, this.blockPosition);
+ this.emptied = true;
+ } else {
+ this.b.setTypeAndData(this.c, this.a, 3);
+ this.d = false;
+ this.generatorAccess.setTypeAndData(this.blockPosition, this.blockData, 3);
+ this.emptied = false;
+ }
+ // CraftBukkit end
}