mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-19 05:00:24 +01:00
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
55 lines
2 KiB
Diff
55 lines
2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sun, 18 Dec 2022 13:40:17 -0800
|
|
Subject: [PATCH] More DragonBattle API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/boss/DragonBattle.java b/src/main/java/org/bukkit/boss/DragonBattle.java
|
|
index 6e5fc92243ee63c2a965f8a4905e29a7993588fd..5dbd12a786a66640ce80acafe2a42e35adef41eb 100644
|
|
--- a/src/main/java/org/bukkit/boss/DragonBattle.java
|
|
+++ b/src/main/java/org/bukkit/boss/DragonBattle.java
|
|
@@ -145,4 +145,44 @@ public interface DragonBattle {
|
|
*/
|
|
NONE;
|
|
}
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the number of gateways tracked by this DragonBattle.
|
|
+ * This starts out at 0 and will increase to 20, once for each
|
|
+ * kill of the {@link EnderDragon}.
|
|
+ *
|
|
+ * @return the number of gateways around the end island tracked by this
|
|
+ */
|
|
+ int getGatewayCount();
|
|
+
|
|
+ /**
|
|
+ * Tries to spawn a new end gateway using default game mechanics.
|
|
+ *
|
|
+ * @return true if successful, false if there is already the maximum.
|
|
+ */
|
|
+ boolean spawnNewGateway();
|
|
+
|
|
+ /**
|
|
+ * Spawns a new end gateway at the specified position. This will
|
|
+ * spawn regardless of the number of gateways already present.
|
|
+ *
|
|
+ * @param position position for the new gateway
|
|
+ */
|
|
+ void spawnNewGateway(@NotNull io.papermc.paper.math.Position position);
|
|
+
|
|
+ /**
|
|
+ * Gets the {@link org.bukkit.entity.EnderCrystal}s being used to respawn the dragon. If no respawn
|
|
+ * is ongoing, the list will be empty.
|
|
+ *
|
|
+ * @return the respawn crystals
|
|
+ */
|
|
+ java.util.@NotNull @org.jetbrains.annotations.Unmodifiable List<org.bukkit.entity.EnderCrystal> getRespawnCrystals();
|
|
+
|
|
+ /**
|
|
+ * Gets the {@link org.bukkit.entity.EnderCrystal}s on top of the pillars that heal the dragon.
|
|
+ *
|
|
+ * @return the healing crystals
|
|
+ */
|
|
+ java.util.@NotNull @org.jetbrains.annotations.Unmodifiable List<org.bukkit.entity.EnderCrystal> getHealingCrystals();
|
|
+ // Paper end
|
|
}
|