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
91 changed files with 293 additions and 336 deletions

View File

@@ -1,14 +1,14 @@
From 96e7b7431ce369a046487a5dfa4514621b9163e9 Mon Sep 17 00:00:00 2001
From 7e86e575ff29520947a3189b43852d7a9992c07f Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 1 Jan 2019 02:22:01 -0800
Subject: [PATCH] Add Heightmap API
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4aca398f10..20d9dd839c 100644
index f797d737a3..983bc1c7d9 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -571,8 +571,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -573,8 +573,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
}