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 1e4cedf5e513f03fc6aa7cb07056f169ed04053c Mon Sep 17 00:00:00 2001
|
||||
From 5da75bccc7609d731a581c3220f046e6bc9f08f8 Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Mon, 29 Feb 2016 17:50:31 -0600
|
||||
Subject: [PATCH] Entity Origin API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
||||
index 699c31d97..c8439d644 100644
|
||||
index d6f9836a1..9cb41f101 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Entity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
||||
@@ -606,4 +606,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
@@ -612,4 +612,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
@Override
|
||||
Spigot spigot();
|
||||
// Spigot end
|
||||
|
@ -66,5 +66,5 @@ index 5a8789324..3022b4a27 100644
|
|||
+ }
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
2.22.1
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue