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:
8b6dd103 Update /version to reflect final build status.
6bdfd385 Remove some draft API designations
78a12dd9 SPIGOT-5417: Campfire should implement Directional

CraftBukkit Changes:
65670174 SPIGOT-5417: Campfire should implement Directional
eeae942e SPIGOT-5416: Block.getDrops gives drops even when tool should not give drops
This commit is contained in:
Shane Freeder
2019-12-10 23:23:50 +00:00
parent 86daffa21c
commit bb8b1e3eca
10 changed files with 46 additions and 46 deletions

View File

@@ -1,4 +1,4 @@
From c6ad801f5bc4b5336f6f1e09679d9e31f5c5c4dc Mon Sep 17 00:00:00 2001
From 5a4094e7f3aad507d9f44cacfddd6a6bb705421d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 24 Mar 2019 00:21:23 -0400
Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners,
or DEFAULT since data was not stored.
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index e063733fa..98b26cd93 100644
index da7b35f0..ac28ba01 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -663,5 +663,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -661,5 +661,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull
Chunk getChunk();
@@ -26,5 +26,5 @@ index e063733fa..98b26cd93 100644
// Paper end
}
--
2.22.1
2.24.0