f00727c57e
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: MiniDigger | Martin <admin@minidigger.dev> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com> Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
49 lines
2.9 KiB
Diff
49 lines
2.9 KiB
Diff
--- a/net/minecraft/world/item/CrossbowItem.java
|
|
+++ b/net/minecraft/world/item/CrossbowItem.java
|
|
@@ -88,8 +_,15 @@
|
|
return getPowerForTime(i, stack, entity) >= 1.0F && isCharged(stack);
|
|
}
|
|
|
|
+ @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper - Add EntityLoadCrossbowEvent
|
|
private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbowStack) {
|
|
- List<ItemStack> list = draw(crossbowStack, shooter.getProjectile(crossbowStack), shooter);
|
|
+ // Paper start - Add EntityLoadCrossbowEvent
|
|
+ return tryLoadProjectiles(shooter, crossbowStack, true);
|
|
+ }
|
|
+
|
|
+ private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbowStack, boolean consume) {
|
|
+ List<ItemStack> list = draw(crossbowStack, shooter.getProjectile(crossbowStack), shooter, consume);
|
|
+ // Paper end - Add EntityLoadCrossbowEvent
|
|
if (!list.isEmpty()) {
|
|
crossbowStack.set(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.of(list));
|
|
return true;
|
|
@@ -141,7 +_,11 @@
|
|
@Override
|
|
protected Projectile createProjectile(Level level, LivingEntity shooter, ItemStack weapon, ItemStack ammo, boolean isCrit) {
|
|
if (ammo.is(Items.FIREWORK_ROCKET)) {
|
|
- return new FireworkRocketEntity(level, ammo, shooter, shooter.getX(), shooter.getEyeY() - 0.15F, shooter.getZ(), true);
|
|
+ // Paper start
|
|
+ FireworkRocketEntity entity = new FireworkRocketEntity(level, ammo, shooter, shooter.getX(), shooter.getEyeY() - 0.15F, shooter.getZ(), true);
|
|
+ entity.spawningEntity = shooter.getUUID(); // Paper
|
|
+ return entity;
|
|
+ // Paper end
|
|
} else {
|
|
Projectile projectile = super.createProjectile(level, shooter, weapon, ammo, isCrit);
|
|
if (projectile instanceof AbstractArrow abstractArrow) {
|
|
@@ -211,7 +_,14 @@
|
|
);
|
|
}
|
|
|
|
- if (f >= 1.0F && !isCharged(stack) && tryLoadProjectiles(livingEntity, stack)) {
|
|
+ if (f >= 1.0F && !isCharged(stack)) {
|
|
+ // Paper start - Add EntityLoadCrossbowEvent
|
|
+ final io.papermc.paper.event.entity.EntityLoadCrossbowEvent event = new io.papermc.paper.event.entity.EntityLoadCrossbowEvent(livingEntity.getBukkitLivingEntity(), stack.asBukkitMirror(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(livingEntity.getUsedItemHand()));
|
|
+ if (!event.callEvent() || !tryLoadProjectiles(livingEntity, stack, event.shouldConsumeItem()) || !event.shouldConsumeItem()) {
|
|
+ if (livingEntity instanceof ServerPlayer player) player.containerMenu.sendAllDataToRemote();
|
|
+ return;
|
|
+ }
|
|
+ // Paper end - Add EntityLoadCrossbowEvent
|
|
chargingSounds.end()
|
|
.ifPresent(
|
|
sound -> level.playSound(
|