Updated Upstream (Bukkit/CraftBukkit)

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:
7361a62e SPIGOT-5641: Add Block.getDrops(ItemStack, Entity)
1dc91b15 Add specific notes about what is not API
2b05ef88 #484: Allow statistics to be accessed for offline players

CraftBukkit Changes:
f7d6ad53 SPIGOT-5603: Use LootContext#lootingModifier in CraftLootTable
5838285d SPIGOT-5657: BlockPlaceEvent not cancelling for tripwire hooks
f325b9be SPIGOT-5641: Add Block.getDrops(ItemStack, Entity)
e25a2272 Fix some formatting in CraftHumanEntity
498540e0 Add Merchant slot delegate
b2de47d5 SPIGOT-5621: Add missing container types for opening InventoryView
aa3a2f27 #645: Allow statistics to be accessed for offline players
2122c0b1 #649: CraftBell should implement Bell
This commit is contained in:
Aikar 2020-04-08 03:49:15 -04:00
parent a65831bd69
commit 2f34301581
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
91 changed files with 293 additions and 336 deletions

View file

@ -1,4 +1,4 @@
From 9e6a8a22c7595adef9fe13fe4849abc0ae937f00 Mon Sep 17 00:00:00 2001
From 5b993133be600a04fc846882400213a82bec3f84 Mon Sep 17 00:00:00 2001
From: simpleauthority <jacob@algorithmjunkie.com>
Date: Tue, 28 May 2019 03:41:28 -0700
Subject: [PATCH] Add BlockSoundGroup interface
@ -64,7 +64,7 @@ index 000000000..8cf87d228
+ Sound getFallSound();
+}
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index 87185a812..038de5a64 100644
index 41f6b8491..971386795 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -1,6 +1,7 @@
@ -75,7 +75,7 @@ index 87185a812..038de5a64 100644
import org.bukkit.Chunk;
import org.bukkit.FluidCollisionMode;
import org.bukkit.Location;
@@ -527,4 +528,16 @@ public interface Block extends Metadatable {
@@ -539,4 +540,16 @@ public interface Block extends Metadatable {
*/
@NotNull
BoundingBox getBoundingBox();