diff options
author | Warren Loo <evilseph@gmail.com> | 2012-03-27 11:37:00 -0400 |
---|---|---|
committer | Warren Loo <evilseph@gmail.com> | 2012-03-27 20:04:26 -0400 |
commit | c100e20d605a0dde2c2e149954324e1659a6108b (patch) | |
tree | ca98a2be106bb69031bd94a5486bb702b599c77b /src/main/java/net/minecraft/server/Entity.java | |
parent | c16bf07e85feb5e7bcb3e4a98048de36fe7859f2 (diff) | |
download | craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar.gz craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar.lz craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.tar.xz craftbukkit-c100e20d605a0dde2c2e149954324e1659a6108b.zip |
Reverting the Drop API for now, we need to re-evalute this as it is causing too many issues and blocking releases.
This reverts commits:
- d2d03afc8854394aeefb40ea5ebf224c8032b19f
- 6245746e91123dd8ef70e5f15b7cdfc7e36d8e8c
- 41fae5c613e9e69a8f6bdf33b23bb09d7f407433
- c34bdecab42cf4098054a5ea43e1c2958d44ae92
- d7445084ac9a90fa0b66d8b050b8d0d2a062eaf3
- 6a6ed2e6ae2328a8a791bcc6857c44dc6c6a7030
- a783bc4dc95da8e26c673abe48fad96b550aba28
- cb50fd68766df8e07631ba5be85759f8257e8068
- 34dfff2ad5c407c712b2783f02960aac5e8649f2
- f33b513820de987b49a4338e85df80968217a601
- 5fd9fdfde055e6eb6a83db246d009b69377b7c94
- 2795b116f40d06551fbb7b96d1963c0ddbeac384
Diffstat (limited to 'src/main/java/net/minecraft/server/Entity.java')
-rw-r--r-- | src/main/java/net/minecraft/server/Entity.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index d3739714..1f3046c8 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Random; // CraftBukkit start -import java.util.ArrayList; import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.block.BlockFace; @@ -18,7 +17,6 @@ import org.bukkit.event.vehicle.VehicleBlockCollisionEvent; import org.bukkit.event.vehicle.VehicleEnterEvent; import org.bukkit.event.vehicle.VehicleExitEvent; import org.bukkit.craftbukkit.entity.CraftPlayer; -import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.event.entity.EntityCombustEvent; import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -1360,18 +1358,12 @@ public abstract class Entity { final PluginManager pluginManager = Bukkit.getPluginManager(); if (thisBukkitEntity instanceof Painting) { - List<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>(); - PaintingBreakByEntityEvent event = new PaintingBreakByEntityEvent((Painting) thisBukkitEntity, stormBukkitEntity, drops); + PaintingBreakByEntityEvent event = new PaintingBreakByEntityEvent((Painting) thisBukkitEntity, stormBukkitEntity); pluginManager.callEvent(event); if (event.isCancelled()) { return; } - - // Something might've been added to the list of drops, so drop them - for (org.bukkit.inventory.ItemStack stack : drops) { - this.a(CraftItemStack.createNMSItemStack(stack), 0.0f); - } } EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(stormBukkitEntity, thisBukkitEntity, EntityDamageEvent.DamageCause.LIGHTNING, 5); |