mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-01 16:29:45 +01:00
fe53b0e76f
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: 1d522878 PR-966: Introduce getRespawnLocation as a replacement for getBedSpawnLocation cc01b745 PR-965: Add DragonBattle#setPreviouslyKilled 28e3702f SPIGOT-6921, PR-957: Add methods to remove all enchantments on an ItemStack 8872404e PR-961: Add BlockData#copyTo 4054cc7b PR-956: Add method to get an offline player's location CraftBukkit Changes: 292ec79e0 SPIGOT-7568: Call EntityChangeBlockEvent for DecoratedPot b44bf5aa8 SPIGOT-7575: SuspiciousStewMeta creates invalid PotionEffect data 161784713 PR-1340: Centralize the conversion from and to Minecraft / Bukkit registry items even more and add a test case for them b93c5a30d PR-1338: Introduce getRespawnLocation as a replacement for getBedSpawnLocation fb973486c SPIGOT-7570: PrepareItemCraftEvent#isRepair() always returns false c9c24535e PR-1337: Add DragonBattle#setPreviouslyKilled c8b4da803 SPIGOT-6921, PR-1330: Add methods to remove all enchantments on an ItemStack 95bc1c4f5 PR-1333: Add BlockData#copyTo 36e2f9ce1 PR-1329: Add method to get an offline player's location Spigot Changes: c198da22 SPIGOT-7563: Update to latest release of bungeecord-chat
37 lines
1.9 KiB
Diff
37 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Trigary <trigary0@gmail.com>
|
|
Date: Tue, 14 Apr 2020 12:06:14 +0200
|
|
Subject: [PATCH] Player elytra boost API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index f57c4a1ce6d1324c2adffed14b9ecb7700bea81c..2f083ef738681ae1219438541487eac093343cf0 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -3153,6 +3153,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
<T> @NotNull T getClientOption(com.destroystokyo.paper.@NotNull ClientOption<T> option);
|
|
// Paper end - client option API
|
|
|
|
+ // Paper start - elytra boost API
|
|
+ /**
|
|
+ * Boost a Player that's {@link #isGliding()} using a {@link Firework}.
|
|
+ * If the creation of the entity is cancelled, no boosting is done.
|
|
+ * This method does not fire {@link com.destroystokyo.paper.event.player.PlayerElytraBoostEvent}.
|
|
+ *
|
|
+ * @param firework The {@link Material#FIREWORK_ROCKET} to boost the player with
|
|
+ * @return The {@link Firework} boosting the Player or null if the spawning of the entity was cancelled
|
|
+ * @throws IllegalArgumentException if {@link #isGliding()} is false
|
|
+ * or if the {@code firework} isn't a {@link Material#FIREWORK_ROCKET}
|
|
+ * @deprecated use {@link HumanEntity#fireworkBoost(ItemStack)} instead. Note that this method <b>does not</b>
|
|
+ * check if the player is gliding or not.
|
|
+ */
|
|
+ default @Nullable Firework boostElytra(final @NotNull ItemStack firework) {
|
|
+ com.google.common.base.Preconditions.checkState(this.isGliding(), "Player must be gliding");
|
|
+ return this.fireworkBoost(firework);
|
|
+ }
|
|
+ // Paper end - elytra boost API
|
|
+
|
|
// Spigot start
|
|
public class Spigot extends Entity.Spigot {
|
|
|