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 72dc38ce5099686082ed1b2f03f692b261783650 Mon Sep 17 00:00:00 2001
|
||||
From 8f07bbb425c028ff4d52daf6f08197239c8436e1 Mon Sep 17 00:00:00 2001
|
||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||
Date: Sat, 1 Dec 2018 19:00:36 -0800
|
||||
Subject: [PATCH] Add Heightmap API
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Add Heightmap API
|
|||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/HeightmapType.java b/src/main/java/com/destroystokyo/paper/HeightmapType.java
|
||||
new file mode 100644
|
||||
index 000000000..4cd9b5ed0
|
||||
index 00000000..4cd9b5ed
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/HeightmapType.java
|
||||
@@ -0,0 +1,35 @@
|
||||
|
@ -46,7 +46,7 @@ index 000000000..4cd9b5ed0
|
|||
+ SOLID_OR_LIQUID_NO_LEAVES;
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
||||
index 2a40da99f..3e1ca4c9f 100644
|
||||
index 2a40da99..3e1ca4c9 100644
|
||||
--- a/src/main/java/org/bukkit/Location.java
|
||||
+++ b/src/main/java/org/bukkit/Location.java
|
||||
@@ -638,6 +638,33 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
||||
|
@ -84,10 +84,10 @@ index 2a40da99f..3e1ca4c9f 100644
|
|||
* Creates explosion at this location with given power
|
||||
*
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index 1818e158f..65dc80229 100644
|
||||
index b02cda3e..1e7b633c 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -161,6 +161,79 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -162,6 +162,79 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@NotNull
|
||||
public Block getHighestBlockAt(@NotNull Location location);
|
||||
|
||||
|
@ -168,5 +168,5 @@ index 1818e158f..65dc80229 100644
|
|||
* Gets the {@link Chunk} at the given coordinates
|
||||
*
|
||||
--
|
||||
2.21.0
|
||||
2.22.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue