|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Jake Potrebic <jake.m.potrebic@gmail.com> |
| 3 | +Date: Tue, 20 Jul 2021 21:35:47 -0700 |
| 4 | +Subject: [PATCH] Add various missing EntityDropItemEvent calls |
| 5 | + |
| 6 | + |
| 7 | +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java |
| 8 | +index 74459ab5ccb94863677f0803f8f737f013cb83a3..19a64b582bc042e426220e080d9c21b3a82cf3f7 100644 |
| 9 | +--- a/src/main/java/net/minecraft/world/entity/Entity.java |
| 10 | ++++ b/src/main/java/net/minecraft/world/entity/Entity.java |
| 11 | +@@ -2509,6 +2509,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { |
| 12 | + stack.setCount(0); // Paper - destroy this item - if this ever leaks due to game bugs, ensure it doesn't dupe |
| 13 | + |
| 14 | + entityitem.setDefaultPickUpDelay(); |
| 15 | ++ // Paper start |
| 16 | ++ return this.spawnAtLocation(entityitem); |
| 17 | ++ } |
| 18 | ++ } |
| 19 | ++ @Nullable |
| 20 | ++ public ItemEntity spawnAtLocation(ItemEntity entityitem) { |
| 21 | ++ { |
| 22 | ++ // Paper end |
| 23 | + // CraftBukkit start |
| 24 | + EntityDropItemEvent event = new EntityDropItemEvent(this.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity()); |
| 25 | + Bukkit.getPluginManager().callEvent(event); |
| 26 | +diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java |
| 27 | +index 7c53dddb598de85abf1eb8b8ee183a6e8e6f9c74..3f100d847fbce6db5b625e99c4f3694576237372 100644 |
| 28 | +--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java |
| 29 | ++++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java |
| 30 | +@@ -593,7 +593,7 @@ public class Dolphin extends WaterAnimal { |
| 31 | + float f2 = 0.02F * Dolphin.this.random.nextFloat(); |
| 32 | + |
| 33 | + entityitem.setDeltaMovement((double) (0.3F * -Mth.sin(Dolphin.this.getYRot() * 0.017453292F) * Mth.cos(Dolphin.this.getXRot() * 0.017453292F) + Mth.cos(f1) * f2), (double) (0.3F * Mth.sin(Dolphin.this.getXRot() * 0.017453292F) * 1.5F), (double) (0.3F * Mth.cos(Dolphin.this.getYRot() * 0.017453292F) * Mth.cos(Dolphin.this.getXRot() * 0.017453292F) + Mth.sin(f1) * f2)); |
| 34 | +- Dolphin.this.level.addFreshEntity(entityitem); |
| 35 | ++ Dolphin.this.spawnAtLocation(entityitem); // Paper - call EntityDropItemEvent |
| 36 | + } |
| 37 | + } |
| 38 | + } |
| 39 | +diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java |
| 40 | +index 8f294f10aca2df007830b12da0506f7614206a89..6a66b5d1a3d8615dcc15057f03476e9ccbf4b4f2 100644 |
| 41 | +--- a/src/main/java/net/minecraft/world/entity/animal/Fox.java |
| 42 | ++++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java |
| 43 | +@@ -497,14 +497,14 @@ public class Fox extends Animal { |
| 44 | + entityitem.setPickUpDelay(40); |
| 45 | + entityitem.setThrower(this.getUUID()); |
| 46 | + this.playSound(SoundEvents.FOX_SPIT, 1.0F, 1.0F); |
| 47 | +- this.level.addFreshEntity(entityitem); |
| 48 | ++ this.spawnAtLocation(entityitem); // Paper - call EntityDropItemEvent |
| 49 | + } |
| 50 | + } |
| 51 | + |
| 52 | + private void dropItemStack(ItemStack stack) { |
| 53 | + ItemEntity entityitem = new ItemEntity(this.level, this.getX(), this.getY(), this.getZ(), stack); |
| 54 | + |
| 55 | +- this.level.addFreshEntity(entityitem); |
| 56 | ++ this.spawnAtLocation(entityitem); // Paper - call EntityDropItemEvent |
| 57 | + } |
| 58 | + |
| 59 | + @Override |
0 commit comments