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,14 +1,14 @@
|
|||
From 2253f78d43d8e82d209391872fa827b5279fb412 Mon Sep 17 00:00:00 2001
|
||||
From bb5fbadd8a83da05bf97bee17be747e7a1211d8b Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sun, 18 Jun 2017 18:17:05 -0500
|
||||
Subject: [PATCH] Entity#fromMobSpawner()
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
||||
index c8439d644..35d0909b1 100644
|
||||
index 9cb41f101..ade1bf5f1 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Entity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
||||
@@ -617,5 +617,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
@@ -623,5 +623,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
*/
|
||||
@Nullable
|
||||
Location getOrigin();
|
||||
|
@ -22,5 +22,5 @@ index c8439d644..35d0909b1 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
2.22.1
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue