Updated Upstream (Bukkit/CraftBukkit)

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:
92f24ff2 SPIGOT-5158: Add SuspiciousStewMeta
b9bf4dae SPIGOT-5310: Add Chunk.contains
b2adbb45 Add API to get/set inhabited time of a Chunk
e3c812dd SPIGOT-5250: Add ChunkSnapshot.contains
71973d85 SPIGOT-5255: Raid / patrol spawn reasons

CraftBukkit Changes:
03b145b3 SPIGOT-5158: Add SuspiciousStewMeta
9aa74304 SPIGOT-5310: Add Chunk.contains
7ef2b20d SPIGOT-3308: RecipeIterator cannot longer remove recipes
023f438c Add API to get/set inhabited time of a Chunk
b79a86ed SPIGOT-5250: Add ChunkSnapshot.contains
aa492e55 SPIGOT-5255: Raid / patrol spawn reasons
This commit is contained in:
Shane Freeder 2019-09-10 19:51:02 +01:00
parent b7dc6fb00e
commit 14513c3ce1
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
12 changed files with 75 additions and 75 deletions

View file

@ -1,4 +1,4 @@
From 8be7e3993740a66b5065a9c12d4557a874e9f8cc Mon Sep 17 00:00:00 2001
From e31205e58fdc02cb6102c7f710a61a1ff8499067 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 4 Aug 2018 19:37:35 -0400
Subject: [PATCH] Provide Chunk Coordinates as a Long API
@ -7,10 +7,10 @@ Allows you to easily access the chunks X/z as a long, and a method
to look up by the long key too.
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
index 58cf0dde..b00c5613 100644
index 95e485ee..7b0424d5 100644
--- a/src/main/java/org/bukkit/Chunk.java
+++ b/src/main/java/org/bukkit/Chunk.java
@@ -26,6 +26,32 @@ public interface Chunk {
@@ -27,6 +27,32 @@ public interface Chunk {
*/
int getZ();
@ -44,7 +44,7 @@ index 58cf0dde..b00c5613 100644
* Gets the world containing this chunk
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index fec5cdc3..189df011 100644
index 59cfe1ce..00a542f8 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -158,6 +158,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
@ -71,5 +71,5 @@ index fec5cdc3..189df011 100644
* Checks if the specified {@link Chunk} is loaded
*
--
2.22.0
2.23.0

View file

@ -1,14 +1,14 @@
From c450f7747478f3c2ca042ba4afc6aa65f76b156a Mon Sep 17 00:00:00 2001
From 7c0eaa2f5e46b50360b8fa61518f57f5af913e00 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 15 Aug 2018 01:04:58 -0400
Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
index b00c5613..0abd4377 100644
index 7b0424d5..7909caef 100644
--- a/src/main/java/org/bukkit/Chunk.java
+++ b/src/main/java/org/bukkit/Chunk.java
@@ -101,13 +101,26 @@ public interface Chunk {
@@ -102,13 +102,26 @@ public interface Chunk {
@NotNull
Entity[] getEntities();
@ -37,5 +37,5 @@ index b00c5613..0abd4377 100644
/**
* Checks if the chunk is loaded.
--
2.22.0
2.23.0