geforkt von Mirrors/Paper
Add EntityLoadCrossbowEvent
Dieser Commit ist enthalten in:
Ursprung
2ff5ce988f
Commit
e793c7d8be
@ -1,6 +1,39 @@
|
|||||||
--- a/net/minecraft/world/item/CrossbowItem.java
|
--- a/net/minecraft/world/item/CrossbowItem.java
|
||||||
+++ b/net/minecraft/world/item/CrossbowItem.java
|
+++ b/net/minecraft/world/item/CrossbowItem.java
|
||||||
@@ -164,7 +164,11 @@
|
@@ -90,7 +90,14 @@
|
||||||
|
public boolean releaseUsing(ItemStack stack, Level world, LivingEntity user, int remainingUseTicks) {
|
||||||
|
int i = this.getUseDuration(stack, user) - remainingUseTicks;
|
||||||
|
float f = getPowerForTime(i, stack, user);
|
||||||
|
- if (f >= 1.0F && !isCharged(stack) && tryLoadProjectiles(user, stack)) {
|
||||||
|
+ // Paper start - Add EntityLoadCrossbowEvent
|
||||||
|
+ 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()) {
|
||||||
|
+ if (user instanceof ServerPlayer player) player.containerMenu.sendAllDataToRemote();
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ // Paper end - Add EntityLoadCrossbowEvent
|
||||||
|
CrossbowItem.ChargingSounds chargingSounds = this.getChargingSounds(stack);
|
||||||
|
chargingSounds.end()
|
||||||
|
.ifPresent(
|
||||||
|
@@ -111,8 +118,14 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- 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;
|
||||||
|
@@ -164,7 +177,11 @@
|
||||||
@Override
|
@Override
|
||||||
protected Projectile createProjectile(Level world, LivingEntity shooter, ItemStack weaponStack, ItemStack projectileStack, boolean critical) {
|
protected Projectile createProjectile(Level world, LivingEntity shooter, ItemStack weaponStack, ItemStack projectileStack, boolean critical) {
|
||||||
if (projectileStack.is(Items.FIREWORK_ROCKET)) {
|
if (projectileStack.is(Items.FIREWORK_ROCKET)) {
|
||||||
|
@ -29,3 +29,24 @@
|
|||||||
stack.hurtAndBreak(this.getDurabilityUse(itemstack1), shooter, LivingEntity.getSlotForHand(hand));
|
stack.hurtAndBreak(this.getDurabilityUse(itemstack1), shooter, LivingEntity.getSlotForHand(hand));
|
||||||
if (stack.isEmpty()) {
|
if (stack.isEmpty()) {
|
||||||
break;
|
break;
|
||||||
|
@@ -93,6 +109,11 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static List<ItemStack> draw(ItemStack stack, ItemStack projectileStack, LivingEntity shooter) {
|
||||||
|
+ // Paper start
|
||||||
|
+ return draw(stack, projectileStack, shooter, true);
|
||||||
|
+ }
|
||||||
|
+ protected static List<ItemStack> draw(ItemStack stack, ItemStack projectileStack, LivingEntity shooter, boolean consume) {
|
||||||
|
+ // Paper end
|
||||||
|
if (projectileStack.isEmpty()) {
|
||||||
|
return List.of();
|
||||||
|
} else {
|
||||||
|
@@ -112,7 +133,7 @@
|
||||||
|
ItemStack itemstack2 = projectileStack.copy();
|
||||||
|
|
||||||
|
for (int k = 0; k < j; ++k) {
|
||||||
|
- 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
|
||||||
|
|
||||||
|
if (!itemstack3.isEmpty()) {
|
||||||
|
list.add(itemstack3);
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren