Paper/patches/server/0454-Add-EntityLoadCrossbowEvent.patch

69 lines
4.2 KiB
Diff
Raw Normal View History

2024-04-24 15:46:45 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: JRoy <joshroy126@gmail.com>
Date: Wed, 7 Oct 2020 12:04:01 -0400
Subject: [PATCH] Add EntityLoadCrossbowEvent
diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
2024-10-23 17:58:11 +02:00
index 710181cf04563f06690eee5b46a5a0d84844ac29..52c40eafc77e50a6fd21b9a7a250cea501f11690 100644
2024-04-24 15:46:45 +02:00
--- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
+++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
2024-06-13 22:57:13 +02:00
@@ -89,7 +89,14 @@ public class CrossbowItem extends ProjectileWeaponItem {
2024-10-23 17:58:11 +02:00
public boolean releaseUsing(ItemStack stack, Level world, LivingEntity user, int remainingUseTicks) {
2024-06-13 22:57:13 +02:00
int i = this.getUseDuration(stack, user) - remainingUseTicks;
float f = getPowerForTime(i, stack, user);
2024-04-24 15:46:45 +02:00
- if (f >= 1.0F && !isCharged(stack) && tryLoadProjectiles(user, stack)) {
2024-06-13 22:57:13 +02:00
+ // Paper start - Add EntityLoadCrossbowEvent
2024-04-24 15:46:45 +02:00
+ if (f >= 1.0F && !isCharged(stack)) {
+ final io.papermc.paper.event.entity.EntityLoadCrossbowEvent event = new io.papermc.paper.event.entity.EntityLoadCrossbowEvent(user.getBukkitLivingEntity(), stack.asBukkitMirror(), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(user.getUsedItemHand()));
+ if (!event.callEvent() || !tryLoadProjectiles(user, stack, event.shouldConsumeItem()) || !event.shouldConsumeItem()) {
2024-04-24 15:46:45 +02:00
+ if (user instanceof ServerPlayer player) player.containerMenu.sendAllDataToRemote();
2024-10-23 17:58:11 +02:00
+ return false;
2024-04-24 15:46:45 +02:00
+ }
2024-06-13 22:57:13 +02:00
+ // Paper end - Add EntityLoadCrossbowEvent
CrossbowItem.ChargingSounds chargingSounds = this.getChargingSounds(stack);
chargingSounds.end()
.ifPresent(
2024-10-23 17:58:11 +02:00
@@ -110,8 +117,14 @@ public class CrossbowItem extends ProjectileWeaponItem {
2024-04-24 15:46:45 +02:00
}
}
- private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow) {
- List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter);
+ @io.papermc.paper.annotation.DoNotUse // Paper - Add EntityLoadCrossbowEvent
+ private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow) {
+ // Paper start - Add EntityLoadCrossbowEvent
+ return CrossbowItem.tryLoadProjectiles(shooter, crossbow, true);
+ }
+ private static boolean tryLoadProjectiles(LivingEntity shooter, ItemStack crossbow, boolean consume) {
+ List<ItemStack> list = draw(crossbow, shooter.getProjectile(crossbow), shooter, consume);
+ // Paper end - Add EntityLoadCrossbowEvent
if (!list.isEmpty()) {
crossbow.set(DataComponents.CHARGED_PROJECTILES, ChargedProjectiles.of(list));
return true;
diff --git a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
2024-10-23 17:58:11 +02:00
index a7d0ac6513fd888e222b3128afc1a227ea91f1d2..78ba170a83f8c026bd110eae494c52577182ed61 100644
2024-04-24 15:46:45 +02:00
--- a/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
+++ b/src/main/java/net/minecraft/world/item/ProjectileWeaponItem.java
2024-10-23 17:58:11 +02:00
@@ -109,6 +109,11 @@ public abstract class ProjectileWeaponItem extends Item {
2024-04-24 15:46:45 +02:00
}
2024-06-13 22:57:13 +02:00
protected static List<ItemStack> draw(ItemStack stack, ItemStack projectileStack, LivingEntity shooter) {
+ // Paper start
+ return draw(stack, projectileStack, shooter, true);
2024-04-24 15:46:45 +02:00
+ }
2024-06-13 22:57:13 +02:00
+ protected static List<ItemStack> draw(ItemStack stack, ItemStack projectileStack, LivingEntity shooter, boolean consume) {
+ // Paper end
2024-04-24 15:46:45 +02:00
if (projectileStack.isEmpty()) {
return List.of();
} else {
2024-10-23 17:58:11 +02:00
@@ -128,7 +133,7 @@ public abstract class ProjectileWeaponItem extends Item {
2024-04-24 15:46:45 +02:00
ItemStack itemstack2 = projectileStack.copy();
for (int k = 0; k < j; ++k) {
2024-06-13 22:57:13 +02:00
- ItemStack itemstack3 = ProjectileWeaponItem.useAmmo(stack, k == 0 ? projectileStack : itemstack2, shooter, k > 0);
+ ItemStack itemstack3 = ProjectileWeaponItem.useAmmo(stack, k == 0 ? projectileStack : itemstack2, shooter, k > 0 || !consume); // Paper
2024-04-24 15:46:45 +02:00
2024-06-13 22:57:13 +02:00
if (!itemstack3.isEmpty()) {
list.add(itemstack3);