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:
Shane Freeder 2019-07-11 17:59:21 +01:00
parent 8812fed9bb
commit 7e8ae207bd
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
50 changed files with 402 additions and 499 deletions

View file

@ -1,4 +1,4 @@
From b6d5548e3c0283d1890cd693fa897857dbd51753 Mon Sep 17 00:00:00 2001
From 8086435d3bbd0275e9ac6bf4e5d5492e8646e3f7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 30 Apr 2018 17:55:28 -0400
Subject: [PATCH] Additional world.getNearbyEntities API's
@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
Provides more methods to get nearby entities, and filter by types and predicates
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 2fe46faf0..e1e674bab 100644
index 3cd4bff1..36ec897f 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1,6 +1,9 @@
@ -19,7 +19,7 @@ index 2fe46faf0..e1e674bab 100644
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -497,6 +500,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -586,6 +589,256 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Collection<Entity> getEntitiesByClasses(@NotNull Class<?>... classes);
@ -277,7 +277,7 @@ index 2fe46faf0..e1e674bab 100644
* Get a list of all players in this World
*
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
index 6c09ea6c6..76c4a1a6e 100644
index 6c09ea6c..76c4a1a6 100644
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -42,8 +42,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
@ -291,5 +291,5 @@ index 6c09ea6c6..76c4a1a6e 100644
*/
public void setPlayerProfile(@NotNull PlayerProfile profile) {
--
2.21.0
2.22.0