geforkt von Mirrors/Paper
ac554ad46d
Updated Upstream (Bukkit/CraftBukkit) 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: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
88 Zeilen
3.2 KiB
Diff
88 Zeilen
3.2 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
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/block/data/type/PinkPetals.java b/src/main/java/org/bukkit/block/data/type/PinkPetals.java
|
|
index a84b36f7587eb2ed9e9177973b3166dc94cdf3df..eae9c9cdd0f47a7480ee23ac7b655692f5ee9c1e 100644
|
|
--- a/src/main/java/org/bukkit/block/data/type/PinkPetals.java
|
|
+++ b/src/main/java/org/bukkit/block/data/type/PinkPetals.java
|
|
@@ -21,6 +21,15 @@ public interface PinkPetals extends Directional {
|
|
*/
|
|
void setFlowerAmount(int flower_amount);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the minimum allowed value of the 'flower_amount' property.
|
|
+ *
|
|
+ * @return the minimum 'flower_amount' value
|
|
+ */
|
|
+ int getMinimumFlowerAmount();
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets the maximum allowed value of the 'flower_amount' property.
|
|
*
|