mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-06 10:44:39 +01:00
40 lines
2.9 KiB
Diff
40 lines
2.9 KiB
Diff
--- a/net/minecraft/world/item/EggItem.java
|
|
+++ b/net/minecraft/world/item/EggItem.java
|
|
@@ -25,13 +25,32 @@
|
|
public InteractionResult use(Level world, Player user, InteractionHand hand) {
|
|
ItemStack itemstack = user.getItemInHand(hand);
|
|
|
|
- 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));
|
|
+ // world.playSound((EntityHuman) null, entityhuman.getX(), entityhuman.getY(), entityhuman.getZ(), SoundEffects.EGG_THROW, SoundCategory.PLAYERS, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); // CraftBukkit - moved down
|
|
if (world instanceof ServerLevel worldserver) {
|
|
- Projectile.spawnProjectileFromRotation(ThrownEgg::new, worldserver, itemstack, user, 0.0F, EggItem.PROJECTILE_SHOOT_POWER, 1.0F);
|
|
- }
|
|
+ // CraftBukkit start
|
|
+ // Paper start - PlayerLaunchProjectileEvent
|
|
+ final Projectile.Delayed<ThrownEgg> thrownEgg = Projectile.spawnProjectileFromRotationDelayed(ThrownEgg::new, worldserver, itemstack, user, 0.0F, EggItem.PROJECTILE_SHOOT_POWER, 1.0F);
|
|
+ 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) thrownEgg.projectile().getBukkitEntity());
|
|
+ if (event.callEvent() && thrownEgg.attemptSpawn()) {
|
|
+ if (event.shouldConsume()) {
|
|
+ itemstack.consume(1, user);
|
|
+ } else if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
+ ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
+ }
|
|
|
|
- user.awardStat(Stats.ITEM_USED.get(this));
|
|
- itemstack.consume(1, user);
|
|
+ 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));
|
|
+ user.awardStat(Stats.ITEM_USED.get(this));
|
|
+ } else {
|
|
+ // Paper end - PlayerLaunchProjectileEvent
|
|
+ if (user instanceof net.minecraft.server.level.ServerPlayer) {
|
|
+ ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
|
|
+ }
|
|
+ return InteractionResult.FAIL;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+ }
|
|
+ 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 - PlayerLaunchProjectileEvent - moved up
|
|
return InteractionResult.SUCCESS;
|
|
}
|
|
|