mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
efd47e3a68
* Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices ecfa559a PR-849: Add InventoryView#setTitle 653d7edb SPIGOT-519: Add TNTPrimeEvent 22fccc09 PR-846: Add method to get chunk load level a070a52c PR-844: Add methods to convert Vector to and from JOML vectors cc7111fe PR-276: Add accessors to Wither's invulnerability ticks 777d24e9 SPIGOT-7209: Accessors and events for player's exp cooldown ccb2d01b SPIGOT-6308: Deprecate the location name property of map items cd04a31b PR-780: Add PlayerSpawnChangeEvent 7d1f5b64 SPIGOT-6780: Improve documentation for World#spawnFallingBlock 5696668a SPIGOT-6885: Add test and easier to debug code for reference in yaml configuration comments 2e13cff7 PR-589: Expand the FishHook API 2c7d3da5 PR-279: Minor edits to various Javadocs CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices a7cfc778f PR-1176: Add InventoryView#setTitle 563d42226 SPIGOT-519: Add TNTPrimeEvent ccbc6abca Add test for Chunk.LoadLevel mirroring 2926e0513 PR-1171: Add method to get chunk load level 63cad7f84 PR-375: Add accessors to Wither's invulnerability ticks bfd8b1ac8 SPIGOT-7209: Accessors and events for player's exp cooldown f92a41c39 PR-1181: Consolidate Location conversion code 10f866759 SPIGOT-6308: Deprecate the location name property of map items 82f7b658a PR-1095: Add PlayerSpawnChangeEvent b421af7e4 PR-808: Expand the FishHook API 598ad7b3f Increase outdated build delay Spigot Changes: d1bd3bd2 Rebuild patches e4265cc8 SPIGOT-7297: Entity Tracking Range option for Display entities * Work around javac bug * Call PlayerSpawnChangeEvent * Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices Spigot Changes: 7da74dae Rebuild patches
67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 16 Oct 2021 22:57:10 -0700
|
|
Subject: [PATCH] Add missing block data mins and maxes
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/data/Levelled.java b/src/main/java/org/bukkit/block/data/Levelled.java
|
|
index 5255538fecae6da413546be3adacd2a99f6c74e9..860f072dee391b300cb1629058a3f9c23dfd95e2 100644
|
|
--- a/src/main/java/org/bukkit/block/data/Levelled.java
|
|
+++ b/src/main/java/org/bukkit/block/data/Levelled.java
|
|
@@ -36,4 +36,13 @@ public interface Levelled extends BlockData {
|
|
* @return the maximum 'level' value
|
|
*/
|
|
int getMaximumLevel();
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the minimum allowed value of the 'level' property.
|
|
+ *
|
|
+ * @return the minimum 'level' value
|
|
+ */
|
|
+ int getMinimumLevel();
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/block/data/type/Candle.java b/src/main/java/org/bukkit/block/data/type/Candle.java
|
|
index d4d08bd424f84523200d1a2012f4d37c07cc3497..7baccce27f2db2242f628ea92a9d040267caef75 100644
|
|
--- a/src/main/java/org/bukkit/block/data/type/Candle.java
|
|
+++ b/src/main/java/org/bukkit/block/data/type/Candle.java
|
|
@@ -28,4 +28,13 @@ public interface Candle extends Lightable, Waterlogged {
|
|
* @return the maximum 'candles' value
|
|
*/
|
|
int getMaximumCandles();
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the minimum allowed value of the 'candles' property.
|
|
+ *
|
|
+ * @return the minimum 'candles' value
|
|
+ */
|
|
+ int getMinimumCandles();
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/block/data/type/Leaves.java b/src/main/java/org/bukkit/block/data/type/Leaves.java
|
|
index 3ea21dfad26222ee70fbc627595f54de1a28aa96..cd013a7c42648d819d1e91c7cf9f97a8190c1fad 100644
|
|
--- a/src/main/java/org/bukkit/block/data/type/Leaves.java
|
|
+++ b/src/main/java/org/bukkit/block/data/type/Leaves.java
|
|
@@ -39,4 +39,20 @@ public interface Leaves extends Waterlogged {
|
|
* @param distance the new 'distance' value
|
|
*/
|
|
void setDistance(int distance);
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the maximum allowed value of the 'distance' property.
|
|
+ *
|
|
+ * @return the maximum 'distance' value
|
|
+ */
|
|
+ int getMaximumDistance();
|
|
+
|
|
+ /**
|
|
+ * Gets the minimum allowed value of the 'distance' property.
|
|
+ *
|
|
+ * @return the minimum 'distance' value
|
|
+ */
|
|
+ int getMinimumDistance();
|
|
+ // Paper end
|
|
}
|