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

Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
eeb1042f #491: Add support to change block's lid state

CraftBukkit Changes:
8fb65851 #660: Add support to change block's lid state
This commit is contained in:
Mariell Hoversholm
2020-07-29 21:50:16 +02:00
parent 4b422c1f0a
commit 9b4ddafa60
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-API-Patches/LootTable-API.patch
View File

@@ -245,8 +245,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/** /**
* Represents a captured state of a chest. * Represents a captured state of a chest.
*/ */
-public interface Chest extends Container, Lootable { -public interface Chest extends Container, Lootable, Lidded {
+public interface Chest extends Container, LootableBlockInventory { // Paper +public interface Chest extends Container, LootableBlockInventory, Lidded { // Paper
/** /**
* Gets the inventory of the chest block represented by this block state. * Gets the inventory of the chest block represented by this block state.
@@ -318,8 +318,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
/** /**
* Represents a captured state of a ShulkerBox. * Represents a captured state of a ShulkerBox.
*/ */
-public interface ShulkerBox extends Container, Lootable { -public interface ShulkerBox extends Container, Lootable, Lidded {
+public interface ShulkerBox extends Container, LootableBlockInventory { // Paper +public interface ShulkerBox extends Container, LootableBlockInventory, Lidded { // Paper
/** /**
* Get the {@link DyeColor} corresponding to this ShulkerBox * Get the {@link DyeColor} corresponding to this ShulkerBox

3
Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
View File

@@ -77,6 +77,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.b = this.a; this.b = this.a;
float f = 0.1F; float f = 0.1F;
@@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntityLootable implements ITickable {
if (this.viewingCount > 0 && this.a == 0.0F) { if (this.viewingCount > 0 && this.a == 0.0F) {
this.a(SoundEffects.BLOCK_CHEST_OPEN); this.a(SoundEffects.BLOCK_CHEST_OPEN);
} }
@@ -106,7 +107,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntityLootable implements ITickable { @@ -0,0 +0,0 @@ public class TileEntityChest extends TileEntityLootable implements ITickable {
} }
private void a(SoundEffect soundeffect) { public void a(SoundEffect soundeffect) { // PAIL private -> public, rename playSound
+ if (!this.getBlock().b(BlockChest.c)) { return; } // Paper - this can be delayed, double check exists - Fixes GH-2074 + if (!this.getBlock().b(BlockChest.c)) { return; } // Paper - this can be delayed, double check exists - Fixes GH-2074
BlockPropertyChestType blockpropertychesttype = (BlockPropertyChestType) this.getBlock().get(BlockChest.c); BlockPropertyChestType blockpropertychesttype = (BlockPropertyChestType) this.getBlock().get(BlockChest.c);

2
work/Bukkit

Submodule work/Bukkit updated: bd45a2f11d...eeb1042f1a

2
work/CraftBukkit

Submodule work/CraftBukkit updated: c3a22e7850...8fb65851f1