mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-01 04:32:11 -07:00
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: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
This commit is contained in:
@@ -20,9 +20,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ public java.util.UUID getSpawningEntity();
|
||||
+ /**
|
||||
+ * If this firework is boosting an entity, return it
|
||||
+ * @deprecated use {@link #getAttachedTo()}
|
||||
+ * @see #setAttachedTo(LivingEntity)
|
||||
+ * @return The entity being boosted
|
||||
+ */
|
||||
+ @org.jetbrains.annotations.Nullable
|
||||
+ public LivingEntity getBoostedEntity();
|
||||
+ @Deprecated
|
||||
+ default LivingEntity getBoostedEntity() {
|
||||
+ return getAttachedTo();
|
||||
+ }
|
||||
+ // Paper end
|
||||
}
|
||||
|
@@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
--- a/src/main/java/org/bukkit/entity/Mob.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Mob.java
|
||||
@@ -0,0 +0,0 @@ public interface Mob extends LivingEntity, Lootable {
|
||||
* @return whether the mob is aware
|
||||
*/
|
||||
public boolean isAware();
|
||||
@Nullable
|
||||
public Sound getAmbientSound();
|
||||
+
|
||||
+ // Paper start
|
||||
+ /**
|
||||
|
@@ -424,9 +424,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
--- a/src/main/java/org/bukkit/entity/Raider.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Raider.java
|
||||
@@ -0,0 +0,0 @@ public interface Raider extends Monster {
|
||||
* @param join CanJoinRaid status
|
||||
*/
|
||||
void setCanJoinRaid(boolean join);
|
||||
@NotNull
|
||||
Sound getCelebrationSound();
|
||||
+
|
||||
+ // Paper start
|
||||
+ /**
|
||||
|
@@ -233,9 +233,9 @@ diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Mob.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Mob.java
|
||||
@@ -0,0 +0,0 @@
|
||||
package org.bukkit.entity;
|
||||
@@ -0,0 +0,0 @@ package org.bukkit.entity;
|
||||
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.loot.Lootable;
|
||||
+import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
@@ -19,8 +19,48 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
* @param meta The FireworkMeta to apply
|
||||
*/
|
||||
@@ -0,0 +0,0 @@ public interface Firework extends Projectile {
|
||||
@org.jetbrains.annotations.Nullable
|
||||
public LivingEntity getBoostedEntity();
|
||||
* {@link #getMaxLife()}, the firework will detonate.
|
||||
*
|
||||
* @param ticks the ticks to set. Must be greater than or equal to 0
|
||||
+ * @deprecated use {@link #setTicksFlown(int)}
|
||||
* @return true if the life was set, false if this firework has already detonated
|
||||
*/
|
||||
+ @Deprecated(forRemoval = true) // Paper
|
||||
boolean setLife(int ticks);
|
||||
|
||||
/**
|
||||
* Get the ticks that this firework has been alive. When this value reaches
|
||||
* {@link #getMaxLife()}, the firework will detonate.
|
||||
*
|
||||
+ * @deprecated use {@link #getTicksFlown()}
|
||||
* @return the life ticks
|
||||
*/
|
||||
+ @Deprecated(forRemoval = true) // Paper
|
||||
int getLife();
|
||||
|
||||
/**
|
||||
* Set the time in ticks this firework will exist until it is detonated.
|
||||
*
|
||||
* @param ticks the ticks to set. Must be greater than 0
|
||||
+ * @deprecated use {@link #setTicksToDetonate(int)}
|
||||
* @return true if the time was set, false if this firework has already detonated
|
||||
*/
|
||||
+ @Deprecated(forRemoval = true) // Paper
|
||||
boolean setMaxLife(int ticks);
|
||||
|
||||
/**
|
||||
* Get the time in ticks this firework will exist until it is detonated.
|
||||
*
|
||||
+ * @deprecated use {@link #getTicksToDetonate()}
|
||||
* @return the maximum life in ticks
|
||||
*/
|
||||
+ @Deprecated(forRemoval = true) // Paper
|
||||
int getMaxLife();
|
||||
|
||||
/**
|
||||
@@ -0,0 +0,0 @@ public interface Firework extends Projectile {
|
||||
return getAttachedTo();
|
||||
}
|
||||
// Paper end
|
||||
+
|
||||
+ // Paper start - Firework API
|
||||
|
Reference in New Issue
Block a user