mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-13 10:21:13 +01:00
31699ae9a8
* Updated Upstream (Bukkit/CraftBukkit) 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: a6a9d2a4 Remove some old ApiStatus.Experimental annotations be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration 08f86d1c PR-971: Add Player methods for client-side potion effects 2e3024a9 PR-963: Add API for in-world structures a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality 1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent CraftBukkit Changes: 38fd4bd50 Fix accidentally renamed internal damage method 80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage 7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects 4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration 22a541a29 Improve support for per-world game rules cb7dccce2 PR-1348: Add Player methods for client-side potion effects b8d6109f0 PR-1335: Add API for in-world structures 4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity e74107678 Fix Crafter maximum stack size 0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality 4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason 20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette 3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook 333701839 SPIGOT-7572: Bee nests generated without bees f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
301 lines
21 KiB
Diff
301 lines
21 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 21 Jul 2018 03:11:03 -0500
|
|
Subject: [PATCH] PlayerLaunchProjectileEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/EggItem.java b/src/main/java/net/minecraft/world/item/EggItem.java
|
|
index 32b63407b943fb00d765dbf4e0eefb4b06f801b6..a3bd507793994e9cc87a956871a8afbb8ca9460d 100644
|
|
--- a/src/main/java/net/minecraft/world/item/EggItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/EggItem.java
|
|
@@ -25,21 +25,33 @@ public class EggItem extends Item {
|
|
|
|
entityegg.setItem(itemstack);
|
|
entityegg.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
|
|
- // CraftBukkit start
|
|
- if (!world.addFreshEntity(entityegg)) {
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityegg.getBukkitEntity());
|
|
+ if (event.callEvent() && world.addFreshEntity(entityegg)) {
|
|
+ if (event.shouldConsume() && !user.getAbilities().instabuild) {
|
|
+ itemstack.shrink(1);
|
|
+ } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
+ ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+
|
|
+ world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), net.minecraft.sounds.SoundEvents.EGG_THROW, net.minecraft.sounds.SoundSource.PLAYERS, 0.5F, 0.4F / (net.minecraft.world.entity.Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
|
|
+ user.awardStat(Stats.ITEM_USED.get(this));
|
|
+ } else {
|
|
if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
}
|
|
return InteractionResultHolder.fail(itemstack);
|
|
}
|
|
- // CraftBukkit end
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
}
|
|
world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.EGG_THROW, SoundSource.PLAYERS, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
|
|
|
|
+ /* // Paper start - PlayerLaunchProjectileEvent; moved up
|
|
user.awardStat(Stats.ITEM_USED.get(this));
|
|
if (!user.getAbilities().instabuild) {
|
|
itemstack.shrink(1);
|
|
}
|
|
+ */ // Paper end - PlayerLaunchProjectileEvent
|
|
|
|
return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide());
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/item/EnderpearlItem.java b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
|
|
index c7d4745aed77b23562cde7c68b8870fa239428d4..8c8cf8705107c95d9a4eab28b5845ae13c4ffb3c 100644
|
|
--- a/src/main/java/net/minecraft/world/item/EnderpearlItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/EnderpearlItem.java
|
|
@@ -25,7 +25,20 @@ public class EnderpearlItem extends Item {
|
|
|
|
entityenderpearl.setItem(itemstack);
|
|
entityenderpearl.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
|
|
- if (!world.addFreshEntity(entityenderpearl)) {
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entityenderpearl.getBukkitEntity());
|
|
+ if (event.callEvent() && world.addFreshEntity(entityenderpearl)) {
|
|
+ if (event.shouldConsume() && !user.getAbilities().instabuild) {
|
|
+ itemstack.shrink(1);
|
|
+ } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
+ ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+
|
|
+ world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENDER_PEARL_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (net.minecraft.world.entity.Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
|
|
+ user.awardStat(Stats.ITEM_USED.get(this));
|
|
+ user.getCooldowns().addCooldown(this, 20);
|
|
+ } else {
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
}
|
|
@@ -33,6 +46,7 @@ public class EnderpearlItem extends Item {
|
|
}
|
|
}
|
|
|
|
+ /* // Paper start - PlayerLaunchProjectileEvent; moved up
|
|
world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENDER_PEARL_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
|
|
user.getCooldowns().addCooldown(this, 20);
|
|
// CraftBukkit end
|
|
@@ -41,6 +55,7 @@ public class EnderpearlItem extends Item {
|
|
if (!user.getAbilities().instabuild) {
|
|
itemstack.shrink(1);
|
|
}
|
|
+ */ // Paper end - PlayerLaunchProjectileEvent; moved up
|
|
|
|
return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide());
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java b/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java
|
|
index 72dfb7b652f515bf9df201d524a851ab56706544..39fe6734c8dcd34c563e33e717937bbd91882e1e 100644
|
|
--- a/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java
|
|
@@ -22,18 +22,37 @@ public class ExperienceBottleItem extends Item {
|
|
@Override
|
|
public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
|
|
ItemStack itemStack = user.getItemInHand(hand);
|
|
- world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
|
|
+ // world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); // Paper - PlayerLaunchProjectileEvent; moved down
|
|
if (!world.isClientSide) {
|
|
ThrownExperienceBottle thrownExperienceBottle = new ThrownExperienceBottle(world, user);
|
|
thrownExperienceBottle.setItem(itemStack);
|
|
thrownExperienceBottle.shootFromRotation(user, user.getXRot(), user.getYRot(), -20.0F, 0.7F, 1.0F);
|
|
- world.addFreshEntity(thrownExperienceBottle);
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Projectile) thrownExperienceBottle.getBukkitEntity());
|
|
+ if (event.callEvent() && world.addFreshEntity(thrownExperienceBottle)) {
|
|
+ if (event.shouldConsume() && !user.getAbilities().instabuild) {
|
|
+ itemStack.shrink(1);
|
|
+ } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
+ ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+
|
|
+ world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.EXPERIENCE_BOTTLE_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (net.minecraft.world.entity.Entity.SHARED_RANDOM.nextFloat() * 0.4F + 0.8F));
|
|
+ user.awardStat(Stats.ITEM_USED.get(this));
|
|
+ } else {
|
|
+ if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
+ ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+ return InteractionResultHolder.fail(itemStack);
|
|
+ }
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
}
|
|
|
|
+ /* // Paper start - PlayerLaunchProjectileEvent; moved up
|
|
user.awardStat(Stats.ITEM_USED.get(this));
|
|
if (!user.getAbilities().instabuild) {
|
|
itemStack.shrink(1);
|
|
}
|
|
+ */ // Paper end - PlayerLaunchProjectileEvent
|
|
|
|
return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide());
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
|
|
index 6e6c9477b70b0e1ab36bca9fa91806a283ebedd1..0821c06a4c66edc8fcee09fc192335a588d2944b 100644
|
|
--- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java
|
|
@@ -47,8 +47,12 @@ public class FireworkRocketItem extends Item {
|
|
Direction direction = context.getClickedFace();
|
|
FireworkRocketEntity fireworkRocketEntity = new FireworkRocketEntity(level, context.getPlayer(), vec3.x + (double)direction.getStepX() * 0.15D, vec3.y + (double)direction.getStepY() * 0.15D, vec3.z + (double)direction.getStepZ() * 0.15D, itemStack);
|
|
fireworkRocketEntity.spawningEntity = context.getPlayer() == null ? null : context.getPlayer().getUUID(); // Paper
|
|
- level.addFreshEntity(fireworkRocketEntity);
|
|
- itemStack.shrink(1);
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) context.getPlayer().getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Firework) fireworkRocketEntity.getBukkitEntity());
|
|
+ if (!event.callEvent() || !level.addFreshEntity(fireworkRocketEntity)) return InteractionResult.PASS;
|
|
+ if (event.shouldConsume() && !context.getPlayer().getAbilities().instabuild) itemStack.shrink(1);
|
|
+ else if (context.getPlayer() instanceof net.minecraft.server.level.ServerPlayer) ((net.minecraft.server.level.ServerPlayer) context.getPlayer()).getBukkitEntity().updateInventory();
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
}
|
|
|
|
return InteractionResult.sidedSuccess(level.isClientSide);
|
|
diff --git a/src/main/java/net/minecraft/world/item/LingeringPotionItem.java b/src/main/java/net/minecraft/world/item/LingeringPotionItem.java
|
|
index 04370590e6c8051ad17f937576b4cd88f6afb5d9..8526251e45899499bc4d9b6254fa1b190a3843d8 100644
|
|
--- a/src/main/java/net/minecraft/world/item/LingeringPotionItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/LingeringPotionItem.java
|
|
@@ -23,7 +23,12 @@ public class LingeringPotionItem extends ThrowablePotionItem {
|
|
|
|
@Override
|
|
public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ InteractionResultHolder<ItemStack> wrapper = super.use(world, user, hand);
|
|
+ if (wrapper.getResult() != net.minecraft.world.InteractionResult.FAIL) {
|
|
world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.LINGERING_POTION_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
|
|
- return super.use(world, user, hand);
|
|
+ }
|
|
+ return wrapper;
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/item/SnowballItem.java b/src/main/java/net/minecraft/world/item/SnowballItem.java
|
|
index d60e57e84f7d66e1858ab50ac33777feedf1c54d..bc8186a5bc3a98b35fad570729dd4ba52efab238 100644
|
|
--- a/src/main/java/net/minecraft/world/item/SnowballItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/SnowballItem.java
|
|
@@ -26,18 +26,26 @@ public class SnowballItem extends Item {
|
|
|
|
entitysnowball.setItem(itemstack);
|
|
entitysnowball.shootFromRotation(user, user.getXRot(), user.getYRot(), 0.0F, 1.5F, 1.0F);
|
|
- if (world.addFreshEntity(entitysnowball)) {
|
|
- if (!user.getAbilities().instabuild) {
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemstack), (org.bukkit.entity.Projectile) entitysnowball.getBukkitEntity());
|
|
+ if (event.callEvent() && world.addFreshEntity(entitysnowball)) {
|
|
+ user.awardStat(Stats.ITEM_USED.get(this));
|
|
+ if (event.shouldConsume() && !user.getAbilities().instabuild) {
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
itemstack.shrink(1);
|
|
+ } else if (user instanceof net.minecraft.server.level.ServerPlayer) { // Paper - PlayerLaunchProjectileEvent
|
|
+ ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory(); // Paper - PlayerLaunchProjectileEvent
|
|
}
|
|
|
|
world.playSound((Player) null, user.getX(), user.getY(), user.getZ(), SoundEvents.SNOWBALL_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
|
|
- } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
- ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
+ } else { // Paper - PlayerLaunchProjectileEvent
|
|
+ if (user instanceof net.minecraft.server.level.ServerPlayer) ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory(); // Paper - PlayerLaunchProjectileEvent
|
|
+ return InteractionResultHolder.fail(itemstack); // Paper - PlayerLaunchProjectileEvent
|
|
}
|
|
}
|
|
// CraftBukkit end
|
|
|
|
+ /* // Paper start - PlayerLaunchProjectileEvent; moved up
|
|
user.awardStat(Stats.ITEM_USED.get(this));
|
|
// CraftBukkit start - moved up
|
|
/*
|
|
@@ -45,6 +53,7 @@ public class SnowballItem extends Item {
|
|
itemstack.shrink(1);
|
|
}
|
|
*/
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
|
|
return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide());
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/item/SplashPotionItem.java b/src/main/java/net/minecraft/world/item/SplashPotionItem.java
|
|
index 317e20052bcac9118e1adeb619bedaacc6fcd690..3bd127780091c6bb9ec17c88f0cf57b0b8f37e11 100644
|
|
--- a/src/main/java/net/minecraft/world/item/SplashPotionItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/SplashPotionItem.java
|
|
@@ -14,7 +14,12 @@ public class SplashPotionItem extends ThrowablePotionItem {
|
|
|
|
@Override
|
|
public InteractionResultHolder<ItemStack> use(Level world, Player user, InteractionHand hand) {
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ InteractionResultHolder<ItemStack> wrapper = super.use(world, user, hand);
|
|
+ if (wrapper.getResult() != net.minecraft.world.InteractionResult.FAIL) {
|
|
world.playSound((Player)null, user.getX(), user.getY(), user.getZ(), SoundEvents.SPLASH_POTION_THROW, SoundSource.PLAYERS, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F));
|
|
- return super.use(world, user, hand);
|
|
+ }
|
|
+ return wrapper;
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
|
|
index 0673f62f25532955f3552b64f122e644d42027e4..f47f793c62a919fb65c081ddb82d597a978d3b20 100644
|
|
--- a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java
|
|
@@ -19,13 +19,31 @@ public class ThrowablePotionItem extends PotionItem {
|
|
ThrownPotion thrownPotion = new ThrownPotion(world, user);
|
|
thrownPotion.setItem(itemStack);
|
|
thrownPotion.shootFromRotation(user, user.getXRot(), user.getYRot(), -20.0F, 0.5F, 1.0F);
|
|
- world.addFreshEntity(thrownPotion);
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) user.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(itemStack), (org.bukkit.entity.Projectile) thrownPotion.getBukkitEntity());
|
|
+ if (event.callEvent() && world.addFreshEntity(thrownPotion)) {
|
|
+ if (event.shouldConsume() && !user.getAbilities().instabuild) {
|
|
+ itemStack.shrink(1);
|
|
+ } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
+ ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+
|
|
+ user.awardStat(Stats.ITEM_USED.get(this));
|
|
+ } else {
|
|
+ if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
+ ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+ return InteractionResultHolder.fail(itemStack);
|
|
+ }
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
}
|
|
|
|
+ /* // Paper start - PlayerLaunchProjectileEvent; moved up
|
|
user.awardStat(Stats.ITEM_USED.get(this));
|
|
if (!user.getAbilities().instabuild) {
|
|
itemStack.shrink(1);
|
|
}
|
|
+ */ // Paper end
|
|
|
|
return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide());
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
|
|
index 2ccbba4775d7550c5c7277aee9cab9ff7d665693..fa876ddf54780728e7f3ecfe02aa8a16b8ef6f8d 100644
|
|
--- a/src/main/java/net/minecraft/world/item/TridentItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/TridentItem.java
|
|
@@ -83,21 +83,26 @@ public class TridentItem extends Item implements Vanishable {
|
|
}
|
|
|
|
// CraftBukkit start
|
|
- if (!world.addFreshEntity(entitythrowntrident)) {
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent event = new com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack), (org.bukkit.entity.Projectile) entitythrowntrident.getBukkitEntity());
|
|
+ if (!event.callEvent() || !world.addFreshEntity(entitythrowntrident)) {
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
if (entityhuman instanceof net.minecraft.server.level.ServerPlayer) {
|
|
((net.minecraft.server.level.ServerPlayer) entityhuman).getBukkitEntity().updateInventory();
|
|
}
|
|
return;
|
|
}
|
|
|
|
+ if (event.shouldConsume()) { // Paper - PlayerLaunchProjectileEvent
|
|
stack.hurtAndBreak(1, entityhuman, (entityhuman1) -> {
|
|
entityhuman1.broadcastBreakEvent(user.getUsedItemHand());
|
|
});
|
|
+ } // Paper - PlayerLaunchProjectileEvent
|
|
entitythrowntrident.pickupItemStack = stack.copy(); // SPIGOT-4511 update since damage call moved
|
|
// CraftBukkit end
|
|
|
|
world.playSound((Player) null, (Entity) entitythrowntrident, SoundEvents.TRIDENT_THROW, SoundSource.PLAYERS, 1.0F, 1.0F);
|
|
- if (!entityhuman.getAbilities().instabuild) {
|
|
+ if (event.shouldConsume() && !entityhuman.getAbilities().instabuild) { // Paper - PlayerLaunchProjectileEvent
|
|
entityhuman.getInventory().removeItem(stack);
|
|
}
|
|
// CraftBukkit start - SPIGOT-5458 also need in this branch :(
|