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
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
10 changed files with 46 additions and 46 deletions

View file

@ -1,4 +1,4 @@
From aad3f10a51d870c9362a602a3dad7e9472880a8d Mon Sep 17 00:00:00 2001
From 77ef58bd694a6a39109f73570fe9b0cf2487884d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 02:25:48 -0400
Subject: [PATCH] Entity#getChunk API
@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
Get the chunk the entity is currently registered to
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index ade1bf5f1..5a7776fa4 100644
index d088490f..1171b103 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -3,6 +3,7 @@ package org.bukkit.entity;
@ -17,7 +17,7 @@ index ade1bf5f1..5a7776fa4 100644
import org.bukkit.EntityEffect;
import org.bukkit.Location;
import org.bukkit.Nameable;
@@ -630,5 +631,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -628,5 +629,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if entity spawned from a mob spawner
*/
boolean fromMobSpawner();
@ -32,5 +32,5 @@ index ade1bf5f1..5a7776fa4 100644
// Paper end
}
--
2.22.1
2.24.0