Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2576)
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 6527cb58 SPIGOT-5329: Clarify isGlowing documentation 5ddb414f Make Lantern extend BlockData cb888903 Fix typos in previous commits 2a5e0ca2 Bring EnchantItemEvent documentation in line with EnchantmentOffer 3c5fcea2 SPIGOT-5317: Create accessors for player absorption hearts c6e0d625 SPIGOT-5320: Clarify scope of ExactChoice CraftBukkit Changes: a3fdef8c SPIGOT-5331: Add support for Java 13 6ddeb980 SPIGOT-5317: Create accessors for player absorption hearts 5d335e96 SPIGOT-5315: Cannot serialize armor stand ItemMeta Spigot Changes: 94af569b SPIGOT-5319: Async catcher for getNearbyEntities
This commit is contained in:
parent
1e5219940c
commit
c68dbb864c
28 changed files with 122 additions and 130 deletions
|
@ -1,4 +1,4 @@
|
|||
From bf78a33f7ec7a3641872c26d76d73a2b3781ed4f Mon Sep 17 00:00:00 2001
|
||||
From c6ad801f5bc4b5336f6f1e09679d9e31f5c5c4dc 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 f41243f92..29229c646 100644
|
||||
index e063733fa..98b26cd93 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Entity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
||||
@@ -657,5 +657,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
@@ -663,5 +663,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
*/
|
||||
@NotNull
|
||||
Chunk getChunk();
|
||||
|
@ -26,5 +26,5 @@ index f41243f92..29229c646 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
2.22.1
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue