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: e99c9444 Add Plugin Chunk Ticket API 6a235f06 Fix incorrect nullability annotations for PlayerJoinEvent's join message CraftBukkit Changes: 5f889388 Tweak build expiration to 7 days 572c02b0 MC-155077, SPIGOT-5113: EntityTracker desync 7ad3a1f4 SPIGOT-5146: BlockDataMeta does not work 60860983 SPIGOT-5155: Setting EntityExplodeEvent yield to 0 still causes blocks to drop 087a2cf4 Print number of force loaded chunks per plugin in crash reports 07b5b06d Add Plugin Chunk Ticket API 7ffb2a27 SPIGOT-5149: resetRecipes does nothing a2275f19 SPIGOT-5141: World.generateTree() causes ClassCastException with huge mushrooms 31d4a777 SPIGOT-5142: Ignore invalid firework effects Spigot Changes: 5e4e7f32 BUILDTOOLS-471: Rebuild patches 6e944739 SPIGOT-5159: Raider activation range overridden by Monster range
This commit is contained in:
parent
8812fed9bb
commit
7e8ae207bd
50 changed files with 402 additions and 499 deletions
|
@ -1,4 +1,4 @@
|
|||
From ca078fe03ed09a84d9259845420a2ba39b6fb3c2 Mon Sep 17 00:00:00 2001
|
||||
From 3fa86b529ef58e6c6640f2e5706ba66fbce7aa72 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 19 Dec 2017 16:24:42 -0500
|
||||
Subject: [PATCH] Expand Explosions API
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
|
|||
Add Entity as a Source capability, and add more API choices, and on Location.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
||||
index 5730d5f46..b226d7e4c 100644
|
||||
index 5730d5f4..b226d7e4 100644
|
||||
--- a/src/main/java/org/bukkit/Location.java
|
||||
+++ b/src/main/java/org/bukkit/Location.java
|
||||
@@ -7,6 +7,7 @@ import java.util.HashMap;
|
||||
|
@ -106,10 +106,10 @@ index 5730d5f46..b226d7e4c 100644
|
|||
* Returns a list of entities within a bounding box centered around a Location.
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index fbd61137d..8f69dced1 100644
|
||||
index 57cc72a1..8c767a0b 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -1201,6 +1201,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1290,6 +1290,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
*/
|
||||
public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
|
||||
|
||||
|
@ -213,5 +213,5 @@ index fbd61137d..8f69dced1 100644
|
|||
* Gets the {@link Environment} type of this world
|
||||
*
|
||||
--
|
||||
2.21.0
|
||||
2.22.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue