mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 21:47:55 +01:00
0b20f94297
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: 96340858 PR-938: Various Sound API improvements cbfe0ff0 PR-937: Minor improvements to World#rayTrace documentation e979ee95 PR-935: Change Consumer and Predicates to super 27ae46dc SPIGOT-3641, SPIGOT-7479, PR-931: Add missing values to EntityEffect 0616ec8b Add eclipse .factorypath file to .gitignore CraftBukkit Changes: 8e162d008 PR-1301: Various Sound API improvements eeb7dfc2d SPIGOT-7520: Attribute LootTableSeed missing for generated containers with attached LootTable d433f086d PR-1297: Change Consumer and Predicates to super 864f616da SPIGOT-7518: Fix NullPointerException when calling Block#applyBoneMeal() 5a2d905af Add eclipse .factorypath file to .gitignore 7c6bf15d4 Fix SkullMeta configuration serialization / deserialization with note block sound Spigot Changes: 7de1049b Rebuild patches
36 lines
1.7 KiB
Diff
36 lines
1.7 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 45065768d73075f065ca98064ca9813918e05747..0cb487cd32a5d47eeb56da2acbae6cc1e1409b62 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -2938,6 +2938,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
*/
|
|
@NotNull
|
|
<T> T getClientOption(@NotNull com.destroystokyo.paper.ClientOption<T> option);
|
|
+
|
|
+ /**
|
|
+ * 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.
|
|
+ */
|
|
+ @Nullable
|
|
+ default Firework boostElytra(@NotNull ItemStack firework) {
|
|
+ com.google.common.base.Preconditions.checkState(this.isGliding(), "Player must be gliding");
|
|
+ return this.fireworkBoost(firework);
|
|
+ }
|
|
// Paper end
|
|
|
|
// Spigot start
|