Skip to content

Commit eafb6c2

Browse files
kennytvkennytv
committed
Merge remote-tracking branch 'up/main' into update/1.21.5
# Conflicts: # paper-api/src/main/java/io/papermc/paper/registry/RegistryKey.java # paper-api/src/main/java/org/bukkit/event/block/BlockBurnEvent.java # paper-api/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java # paper-api/src/main/java/org/bukkit/event/block/BlockCookEvent.java # paper-api/src/main/java/org/bukkit/event/block/BlockMultiPlaceEvent.java # paper-api/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java # paper-api/src/main/java/org/bukkit/event/block/BlockPistonExtendEvent.java # paper-api/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java # paper-api/src/main/java/org/bukkit/event/block/SignChangeEvent.java # paper-api/src/main/java/org/bukkit/event/entity/EntityCombustByBlockEvent.java # paper-api/src/main/java/org/bukkit/event/entity/EntityCombustByEntityEvent.java # paper-api/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java # paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java # paper-api/src/main/java/org/bukkit/event/entity/EntityPlaceEvent.java # paper-api/src/main/java/org/bukkit/event/entity/EntityResurrectEvent.java # paper-api/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java # paper-api/src/main/java/org/bukkit/event/entity/EntityUnleashEvent.java # paper-api/src/main/java/org/bukkit/event/entity/ExpBottleEvent.java # paper-api/src/main/java/org/bukkit/event/entity/ItemSpawnEvent.java # paper-api/src/main/java/org/bukkit/event/entity/LingeringPotionSplashEvent.java # paper-api/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java # paper-api/src/main/java/org/bukkit/event/entity/PlayerLeashEntityEvent.java # paper-api/src/main/java/org/bukkit/event/entity/PotionSplashEvent.java # paper-api/src/main/java/org/bukkit/event/entity/ProjectileHitEvent.java # paper-api/src/main/java/org/bukkit/event/entity/SheepDyeWoolEvent.java # paper-api/src/main/java/org/bukkit/event/inventory/FurnaceSmeltEvent.java # paper-api/src/main/java/org/bukkit/event/inventory/FurnaceStartSmeltEvent.java # paper-api/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerAnimationEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerArmorStandManipulateEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerGameModeChangeEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerHarvestBlockEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerItemDamageEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerItemMendEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerKickEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerPortalEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerRiptideEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java # paper-api/src/main/java/org/bukkit/event/player/PlayerUnleashEntityEvent.java # paper-api/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java # paper-api/src/main/java/org/bukkit/event/server/ServerListPingEvent.java # paper-api/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java # paper-api/src/main/java/org/bukkit/event/weather/LightningStrikeEvent.java # paper-api/src/main/java/org/bukkit/event/weather/ThunderChangeEvent.java # paper-api/src/main/java/org/bukkit/event/weather/WeatherChangeEvent.java # paper-api/src/main/java/org/bukkit/event/world/PortalCreateEvent.java # paper-server/patches/features/0003-Entity-Activation-Range-2.0.patch # paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch # paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch # paper-server/patches/sources/net/minecraft/server/players/PlayerList.java.patch # paper-server/patches/sources/net/minecraft/world/inventory/AbstractContainerMenu.java.patch # paper-server/patches/sources/net/minecraft/world/inventory/ContainerSynchronizer.java.patch # paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java # paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java # paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
2 parents 78af68b + c467df9 commit eafb6c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+409
-95
lines changed

‎CONTRIBUTING.md

+34
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,40 @@ are assumed to be non-null by default. For less obvious placing such as on gener
264264
**For other classes**: Keep using both `@Nullable` and `@NotNull` from `org.jetbrains.annotations`. These
265265
will be replaced later.
266266

267+
### API checks
268+
269+
When performing API-related checks where an exception needs to be thrown under specific conditions, you should use the `Preconditions` class.
270+
271+
#### Checking Method Arguments
272+
To validate method arguments, use `Preconditions#checkArgument`. This will throw an `IllegalArgumentException` if the condition is not met.
273+
> Don't use Preconditions#checkNotNull, as it throws a NullPointerException, which makes it harder to determine whether the error was caused by an internal issue or invalid arguments.
274+
275+
ex:
276+
```java
277+
@Override
278+
public void sendMessage(Player player, Component message) {
279+
Preconditions.checkArgument(player != null, "player cannot be null");
280+
Preconditions.checkArgument(player.isOnline(), "player %s must be online", player.getName());
281+
Preconditions.checkArgument(message != null, "message cannot be null");
282+
// rest of code
283+
}
284+
```
285+
286+
#### Checking Object State
287+
To validate the state of an object inside a method, use `Preconditions#checkState`. This will throw an `IllegalStateException` if the condition is not met.
288+
ex:
289+
```java
290+
private Player player;
291+
292+
@Override
293+
public void sendMessage(Component message) {
294+
Preconditions.checkArgument(message != null, "message cannot be null");
295+
Preconditions.checkState(this.player != null, "player cannot be null");
296+
Preconditions.checkState(this.player.isOnline(), "player %s must be online", this.player.getName());
297+
// rest of code
298+
}
299+
```
300+
267301
## Access Transformers
268302
Sometimes, Vanilla code already contains a field, method, or type you want to access
269303
but the visibility is too low (e.g. a private field in an entity class). Paper can use access transformers

‎build-data/paper.at

+2
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ public net.minecraft.world.inventory.DispenserMenu dispenser
535535
public net.minecraft.world.inventory.HorseInventoryMenu SLOT_BODY_ARMOR
536536
public net.minecraft.world.inventory.HorseInventoryMenu SLOT_HORSE_INVENTORY_START
537537
public net.minecraft.world.inventory.HorseInventoryMenu SLOT_SADDLE
538+
public net.minecraft.world.inventory.HorseInventoryMenu horse
538539
public net.minecraft.world.inventory.MerchantContainer selectionHint
539540
public net.minecraft.world.inventory.Slot slot
540541
public net.minecraft.world.item.AdventureModePredicate predicates
@@ -652,6 +653,7 @@ public net.minecraft.world.level.block.entity.SculkSensorBlockEntity lastVibrati
652653
public net.minecraft.world.level.block.entity.SculkShriekerBlockEntity warningLevel
653654
public net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity openCount
654655
public net.minecraft.world.level.block.entity.SignBlockEntity playerWhoMayEdit
656+
public net.minecraft.world.level.block.entity.SkullBlockEntity customName
655657
public net.minecraft.world.level.block.entity.SkullBlockEntity noteBlockSound
656658
public net.minecraft.world.level.block.entity.SkullBlockEntity owner
657659
public net.minecraft.world.level.block.entity.StructureBlockEntity author

‎build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ subprojects {
3838
options.encoding = Charsets.UTF_8.name()
3939
options.release = 21
4040
options.isFork = true
41+
options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal"))
4142
}
4243
tasks.withType<Javadoc> {
4344
options.encoding = Charsets.UTF_8.name()

‎paper-api/src/main/java/org/bukkit/Bukkit.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -1117,20 +1117,24 @@ public static boolean dispatchCommand(@NotNull CommandSender sender, @NotNull St
11171117

11181118
/**
11191119
* Adds a recipe to the crafting manager.
1120+
* Recipes added with this method won't be sent to the client automatically.
1121+
* <p>
1122+
* Players still have to discover recipes via {@link Player#discoverRecipe(NamespacedKey)}
1123+
* before seeing them in their recipe book.
11201124
*
11211125
* @param recipe the recipe to add
1122-
* @return true if the recipe was added, false if it wasn't for some
1123-
* reason
1126+
* @return true if the recipe was added, false if it wasn't for some reason
1127+
* @see #addRecipe(Recipe, boolean)
11241128
*/
11251129
@Contract("null -> false")
11261130
public static boolean addRecipe(@Nullable Recipe recipe) {
11271131
return server.addRecipe(recipe);
11281132
}
11291133

1130-
// Paper start - method to send recipes immediately
11311134
/**
11321135
* Adds a recipe to the crafting manager.
11331136
*
1137+
* @apiNote resendRecipes is ignored at the moment for stability reasons, recipes will always be updated
11341138
* @param recipe the recipe to add
11351139
* @param resendRecipes true to update the client with the full set of recipes
11361140
* @return true if the recipe was added, false if it wasn't for some reason
@@ -1139,7 +1143,6 @@ public static boolean addRecipe(@Nullable Recipe recipe) {
11391143
public static boolean addRecipe(@Nullable Recipe recipe, boolean resendRecipes) {
11401144
return server.addRecipe(recipe, resendRecipes);
11411145
}
1142-
// Paper end - method to send recipes immediately
11431146

11441147
/**
11451148
* Get a list of all recipes for a given item. The stack size is ignored

‎paper-api/src/main/java/org/bukkit/NamespacedKey.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,12 @@ private static boolean isValidKey(String key) {
8383
* @see #NamespacedKey(Plugin, String)
8484
*/
8585
public NamespacedKey(@NotNull String namespace, @NotNull String key) {
86-
Preconditions.checkArgument(namespace != null && isValidNamespace(namespace), "Invalid namespace. Must be [a-z0-9._-]: %s", namespace);
87-
Preconditions.checkArgument(key != null && isValidKey(key), "Invalid key. Must be [a-z0-9/._-]: %s", key);
88-
86+
Preconditions.checkArgument(namespace != null, "Namespace cannot be null");
87+
Preconditions.checkArgument(key != null, "Key cannot be null");
8988
this.namespace = namespace;
9089
this.key = key;
9190

92-
String string = toString();
93-
Preconditions.checkArgument(string.length() <= Short.MAX_VALUE, "NamespacedKey must be less than 32768 characters", string); // Paper - Fix improper length validation
91+
this.validate();
9492
}
9593

9694
/**
@@ -108,16 +106,17 @@ public NamespacedKey(@NotNull String namespace, @NotNull String key) {
108106
public NamespacedKey(@NotNull Plugin plugin, @NotNull String key) {
109107
Preconditions.checkArgument(plugin != null, "Plugin cannot be null");
110108
Preconditions.checkArgument(key != null, "Key cannot be null");
111-
112109
this.namespace = plugin.getName().toLowerCase(Locale.ROOT);
113110
this.key = key.toLowerCase(Locale.ROOT);
114111

115112
// Check validity after normalization
113+
this.validate();
114+
}
115+
116+
private void validate() {
117+
Preconditions.checkArgument(this.namespace.length() + 1 + this.key.length() <= Short.MAX_VALUE, "NamespacedKey must be less than 32768 characters");
116118
Preconditions.checkArgument(isValidNamespace(this.namespace), "Invalid namespace. Must be [a-z0-9._-]: %s", this.namespace);
117119
Preconditions.checkArgument(isValidKey(this.key), "Invalid key. Must be [a-z0-9/._-]: %s", this.key);
118-
119-
String string = toString();
120-
Preconditions.checkArgument(string.length() <= Short.MAX_VALUE, "NamespacedKey must be less than 32768 characters", string); // Paper - Fix improper length validation
121120
}
122121

123122
@NotNull

‎paper-api/src/main/java/org/bukkit/Registry.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private static <A extends Keyed> Registry<A> registryFor(final RegistryKey<A> re
6464
@SuppressWarnings("removal")
6565
@Deprecated(forRemoval = true, since = "1.21.4")
6666
private static <A extends Keyed> Registry<A> legacyRegistryFor(final Class<A> clazz) {
67-
return Objects.requireNonNull(RegistryAccess.registryAccess().getRegistry(clazz), "No registry present for " + clazz.getSimpleName() + ". This is a bug.");
67+
return Objects.requireNonNull(RegistryAccess.registryAccess().getRegistry(clazz), () -> "No registry present for " + clazz.getSimpleName() + ". This is a bug.");
6868
}
6969

7070
/**

‎paper-api/src/main/java/org/bukkit/Server.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -990,26 +990,24 @@ default World getWorld(@NotNull NamespacedKey worldKey) {
990990
public boolean dispatchCommand(@NotNull CommandSender sender, @NotNull String commandLine) throws CommandException;
991991

992992
/**
993-
* Adds a recipe to the crafting manager. Recipes added with
994-
* this method won't be sent to the client automatically. Use
995-
* {@link #updateRecipes()} or {@link #updateResources()} to
996-
* update clients to new recipes added.
993+
* Adds a recipe to the crafting manager.
994+
* Recipes added with this method won't be sent to the client automatically.
997995
* <p>
998-
* Player's still have to discover recipes via {@link Player#discoverRecipe(NamespacedKey)}
996+
* Players still have to discover recipes via {@link Player#discoverRecipe(NamespacedKey)}
999997
* before seeing them in their recipe book.
1000998
*
1001999
* @param recipe the recipe to add
1002-
* @return true if the recipe was added, false if it wasn't for some
1003-
* reason
1000+
* @return true if the recipe was added, false if it wasn't for some reason
10041001
* @see #addRecipe(Recipe, boolean)
10051002
*/
10061003
@Contract("null -> false")
1007-
public boolean addRecipe(@Nullable Recipe recipe);
1004+
boolean addRecipe(@Nullable Recipe recipe);
10081005

10091006
// Paper start - method to send recipes immediately
10101007
/**
10111008
* Adds a recipe to the crafting manager.
10121009
*
1010+
* @apiNote resendRecipes is ignored for now for stability reasons, recipes will always be updated
10131011
* @param recipe the recipe to add
10141012
* @param resendRecipes true to update the client with the full set of recipes
10151013
* @return true if the recipe was added, false if it wasn't for some reason

‎paper-api/src/main/java/org/bukkit/World.java

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.bukkit;
22

3-
import java.io.File;
43
import io.papermc.paper.raytracing.PositionedRayTraceConfigurationBuilder;
5-
import org.bukkit.generator.ChunkGenerator;
6-
4+
import java.io.File;
75
import java.util.ArrayList;
86
import java.util.Collection;
97
import java.util.HashMap;
@@ -2410,9 +2408,17 @@ public default boolean createExplosion(@NotNull Entity source, float power) {
24102408
public BiomeProvider getBiomeProvider();
24112409

24122410
/**
2413-
* Saves world to disk
2411+
* Saves the world to disk
2412+
*/
2413+
default void save() {
2414+
save(false);
2415+
}
2416+
2417+
/**
2418+
* Saves the world to disk
2419+
* @param flush Whether to wait for the chunk writer to finish
24142420
*/
2415-
public void save();
2421+
void save(boolean flush);
24162422

24172423
/**
24182424
* Gets a list of all applied {@link BlockPopulator}s for this World

‎paper-api/src/main/java/org/bukkit/block/Skull.java

+21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.bukkit.block;
22

3+
import net.kyori.adventure.text.Component;
34
import org.bukkit.Material;
45
import org.bukkit.NamespacedKey;
56
import org.bukkit.OfflinePlayer;
@@ -168,4 +169,24 @@ public interface Skull extends TileState {
168169
@Deprecated(since = "1.13", forRemoval = true)
169170
@Contract("_ -> fail")
170171
public void setSkullType(SkullType skullType);
172+
173+
/**
174+
* Get the custom name of skull.
175+
* <p>This name is set when placing a skull item that has a custom name.
176+
* This name is only carried back to the item when broken for player heads
177+
* (skeleton/creeper heads will not retain the name).</p>
178+
*
179+
* @return Custom name of skull
180+
*/
181+
public @Nullable Component customName();
182+
183+
/**
184+
* Set the custom name of skull.
185+
* <p>This name is set when placing a skull item that has a custom name.
186+
* This name is only carried back to the item when broken for player heads
187+
* (skeleton/creeper heads will not retain the name).</p>
188+
*
189+
* @param customName Custom name of skull
190+
*/
191+
public void customName(@Nullable Component customName);
171192
}

‎paper-api/src/main/java/org/bukkit/generator/ChunkGenerator.java

+14
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.bukkit.material.MaterialData;
1515
import org.jetbrains.annotations.NotNull;
1616
import org.jetbrains.annotations.Nullable;
17+
import org.jetbrains.annotations.Range;
1718

1819
/**
1920
* A chunk generator is responsible for the initial shaping of an entire
@@ -777,5 +778,18 @@ public static interface ChunkData {
777778
*/
778779
@Deprecated(since = "1.8.8")
779780
public byte getData(int x, int y, int z);
781+
782+
/**
783+
* Get the current height of a position in the chunk data.
784+
* <p>This will differ based on which state generation of the chunk is currently at.
785+
* If for example the chunk is in the generate surface stage,
786+
* this will return what was already generated in the noise stage.</p>
787+
*
788+
* @param heightMap Heightmap to determine where to grab height
789+
* @param x the x location in the chunk from 0-15 inclusive
790+
* @param z the z location in the chunk from 0-15 inclusive
791+
* @return Y coordinate at highest position
792+
*/
793+
int getHeight(@NotNull HeightMap heightMap, @Range(from = 0L, to = 15L) int x, @Range(from = 0L, to = 15L) int z);
780794
}
781795
}

‎paper-api/src/main/java/org/bukkit/inventory/FurnaceRecipe.java

-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.bukkit.Material;
55
import org.bukkit.NamespacedKey;
66
import org.bukkit.material.MaterialData;
7-
import org.jetbrains.annotations.ApiStatus;
87
import org.jetbrains.annotations.NotNull;
98

109
/**
@@ -41,7 +40,6 @@ public FurnaceRecipe(@NotNull ItemStack result, @NotNull Material source, int da
4140
* @param experience The experience given by this recipe
4241
* @param cookingTime The cooking time (in ticks)
4342
*/
44-
@ApiStatus.Internal
4543
public FurnaceRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @NotNull Material source, float experience, int cookingTime) {
4644
this(key, result, source, 0, experience, cookingTime);
4745
}
@@ -60,7 +58,6 @@ public FurnaceRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @Not
6058
* @param experience The experience given by this recipe
6159
* @param cookingTime The cooking time (in ticks)
6260
*/
63-
@ApiStatus.Internal
6461
public FurnaceRecipe(@NotNull NamespacedKey key, @NotNull ItemStack result, @NotNull RecipeChoice input, float experience, int cookingTime) {
6562
super(key, result, input, experience, cookingTime);
6663
}

‎paper-api/src/main/java/org/bukkit/inventory/InventoryView.java

+5
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@ public int getId() {
242242
@NotNull
243243
public InventoryType.SlotType getSlotType(int slot);
244244

245+
/**
246+
* Opens the inventory view.
247+
*/
248+
void open();
249+
245250
/**
246251
* Closes the inventory view.
247252
*/

‎paper-api/src/main/java/org/bukkit/inventory/ItemStack.java

+27-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Locale;
77
import java.util.Map;
88
import java.util.function.Consumer;
9+
import java.util.function.Predicate;
910
import net.kyori.adventure.text.Component;
1011
import org.bukkit.Bukkit;
1112
import org.bukkit.Material;
@@ -57,7 +58,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
5758
*/
5859
@org.jetbrains.annotations.Contract(value = "_, _ -> new", pure = true)
5960
public static @NotNull ItemStack of(final @NotNull Material type, final int amount) {
60-
Preconditions.checkArgument(type.asItemType() != null, type + " isn't an item");
61+
Preconditions.checkArgument(type.asItemType() != null, "%s isn't an item", type);
6162
Preconditions.checkArgument(amount > 0, "amount must be greater than 0");
6263
return java.util.Objects.requireNonNull(type.asItemType(), type + " is not an item").createItemStack(amount); // Paper - delegate
6364
}
@@ -1306,6 +1307,31 @@ public void resetData(final io.papermc.paper.datacomponent.@NotNull DataComponen
13061307
this.craftDelegate.resetData(type);
13071308
}
13081309

1310+
/**
1311+
* Copies component values and component removals from the provided ItemStack.
1312+
* <p>
1313+
* Example:
1314+
* <pre>{@code
1315+
* Set<DataComponentType> types = Set.of(
1316+
* DataComponentTypes.CONSUMABLE,
1317+
* DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE,
1318+
* DataComponentTypes.RARITY
1319+
* );
1320+
*
1321+
* ItemStack source = ItemStack.of(Material.ENCHANTED_GOLDEN_APPLE);
1322+
* ItemStack target = ItemStack.of(Material.GOLDEN_CARROT);
1323+
*
1324+
* target.copyDataFrom(source, types::contains);
1325+
* }</pre>
1326+
*
1327+
* @param source the item stack to copy from
1328+
* @param filter predicate for which components to copy
1329+
*/
1330+
@org.jetbrains.annotations.ApiStatus.Experimental
1331+
public void copyDataFrom(final @NotNull ItemStack source, final @NotNull Predicate<io.papermc.paper.datacomponent.@NotNull DataComponentType> filter) {
1332+
this.craftDelegate.copyDataFrom(source, filter);
1333+
}
1334+
13091335
/**
13101336
* Checks if the data component type is overridden from the default for the
13111337
* item type.

‎paper-server/patches/features/0003-Entity-Activation-Range-2.0.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -770,11 +770,11 @@ index 34b5839cf0c6b705c3f329dd26cb36fa333f5f1e..8800d1440073d0abf1d78f58e8396c87
770770
+ public void inactiveTick() {
771771
+ this.life++;
772772
+ if (this.life > this.lifetime && this.level() instanceof ServerLevel serverLevel) {
773-
+ // CraftBukkit start
774-
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
773+
+ // Paper start - Call FireworkExplodeEvent
774+
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this)) {
775775
+ this.explode(serverLevel);
776776
+ }
777-
+ // CraftBukkit end
777+
+ // Paper end - Call FireworkExplodeEvent
778778
+ }
779779
+ super.inactiveTick();
780780
+ }

0 commit comments

Comments
 (0)