From f520069aa6434e1073c7252fda4faf07efa20134 Mon Sep 17 00:00:00 2001 From: Warren Loo Date: Tue, 27 Mar 2012 10:16:42 -0400 Subject: Reverting the Drop API for now, we need to re-evalute this as it is causing too many issues and blocking releases. This reverts commit 2d17b0c24e2de982c09ad6050a95db0fac70c3ad. --- .../java/org/bukkit/event/block/BlockBreakEvent.java | 17 +---------------- .../java/org/bukkit/event/entity/EntityDeathEvent.java | 3 +-- .../event/painting/PaintingBreakByEntityEvent.java | 7 ++----- .../org/bukkit/event/painting/PaintingBreakEvent.java | 15 +-------------- .../org/bukkit/event/player/PlayerShearEntityEvent.java | 16 +--------------- .../org/bukkit/event/vehicle/VehicleDestroyEvent.java | 17 +---------------- 6 files changed, 7 insertions(+), 68 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/bukkit/event/block/BlockBreakEvent.java b/src/main/java/org/bukkit/event/block/BlockBreakEvent.java index 413155bc..606957f4 100644 --- a/src/main/java/org/bukkit/event/block/BlockBreakEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockBreakEvent.java @@ -1,12 +1,9 @@ package org.bukkit.event.block; -import java.util.List; - import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; /** * Called when a block is broken by a player. @@ -22,13 +19,11 @@ public class BlockBreakEvent extends BlockEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); private final Player player; private boolean cancel; - private List drops; - public BlockBreakEvent(final Block theBlock, final Player player, List drops) { + public BlockBreakEvent(final Block theBlock, final Player player) { super(theBlock); this.player = player; this.cancel = false; - this.drops = drops; } /** @@ -40,16 +35,6 @@ public class BlockBreakEvent extends BlockEvent implements Cancellable { return player; } - /** - * Gets a list of items that should drop from this block. Modifying this list will modify the items drop. - * If the block is a container, the contents of the container will not be included in this list. You can - * get the contents of the container by casting the block's state. - * @return A list of drops - */ - public List getDrops() { - return drops; - } - public boolean isCancelled() { return cancel; } diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java index 9e7a622f..d39596f6 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java @@ -53,8 +53,7 @@ public class EntityDeathEvent extends EntityEvent { } /** - * Gets all the items which will drop when the entity dies. Modifying this list will - * modify what's actually dropped. + * Gets all the items which will drop when the entity dies * * @return Items to drop when the entity dies */ diff --git a/src/main/java/org/bukkit/event/painting/PaintingBreakByEntityEvent.java b/src/main/java/org/bukkit/event/painting/PaintingBreakByEntityEvent.java index 6b594719..d7f0bb16 100644 --- a/src/main/java/org/bukkit/event/painting/PaintingBreakByEntityEvent.java +++ b/src/main/java/org/bukkit/event/painting/PaintingBreakByEntityEvent.java @@ -1,10 +1,7 @@ package org.bukkit.event.painting; -import java.util.List; - import org.bukkit.entity.Entity; import org.bukkit.entity.Painting; -import org.bukkit.inventory.ItemStack; /** * Triggered when a painting is removed by an entity @@ -12,8 +9,8 @@ import org.bukkit.inventory.ItemStack; public class PaintingBreakByEntityEvent extends PaintingBreakEvent { private final Entity remover; - public PaintingBreakByEntityEvent(final Painting painting, final Entity remover, List drops) { - super(painting, RemoveCause.ENTITY, drops); + public PaintingBreakByEntityEvent(final Painting painting, final Entity remover) { + super(painting, RemoveCause.ENTITY); this.remover = remover; } diff --git a/src/main/java/org/bukkit/event/painting/PaintingBreakEvent.java b/src/main/java/org/bukkit/event/painting/PaintingBreakEvent.java index 140846bd..edf3559c 100644 --- a/src/main/java/org/bukkit/event/painting/PaintingBreakEvent.java +++ b/src/main/java/org/bukkit/event/painting/PaintingBreakEvent.java @@ -1,11 +1,8 @@ package org.bukkit.event.painting; -import java.util.List; - import org.bukkit.entity.Painting; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; /** * Triggered when a painting is removed @@ -14,12 +11,10 @@ public class PaintingBreakEvent extends PaintingEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); private boolean cancelled; private final RemoveCause cause; - private List drops; - public PaintingBreakEvent(final Painting painting, final RemoveCause cause, List drops) { + public PaintingBreakEvent(final Painting painting, final RemoveCause cause) { super(painting); this.cause = cause; - this.drops = drops; } /** @@ -39,14 +34,6 @@ public class PaintingBreakEvent extends PaintingEvent implements Cancellable { this.cancelled = cancel; } - /** - * Gets the list of items to be dropped. Modifying this list will modify what's actually dropped. - * @return A list of drops - */ - public List getDrops() { - return drops; - } - /** * An enum to specify the cause of the removal */ diff --git a/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java index 4fe6bb1a..38afb3ce 100644 --- a/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerShearEntityEvent.java @@ -1,12 +1,9 @@ package org.bukkit.event.player; -import java.util.List; - import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; /** * Called when a player shears an entity @@ -15,13 +12,11 @@ public class PlayerShearEntityEvent extends PlayerEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); private boolean cancel; private final Entity what; - private final List items; - public PlayerShearEntityEvent(final Player who, final Entity what, final List drops) { + public PlayerShearEntityEvent(final Player who, final Entity what) { super(who); this.cancel = false; this.what = what; - this.items = drops; } public boolean isCancelled() { @@ -41,15 +36,6 @@ public class PlayerShearEntityEvent extends PlayerEvent implements Cancellable { return what; } - /** - * Get the items that will drop as a result of the shearing. To change the - * items dropped, change the contents of this list. - * @return The list of items. - */ - public List getDrops() { - return items; - } - @Override public HandlerList getHandlers() { return handlers; diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java index 3351a89c..7a481d3a 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleDestroyEvent.java @@ -1,12 +1,9 @@ package org.bukkit.event.vehicle; -import java.util.List; - import org.bukkit.entity.Entity; import org.bukkit.entity.Vehicle; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; /** * Raised when a vehicle is destroyed, which could be caused by either a player @@ -17,12 +14,10 @@ public class VehicleDestroyEvent extends VehicleEvent implements Cancellable { private static final HandlerList handlers = new HandlerList(); private final Entity attacker; private boolean cancelled; - private List drops; - public VehicleDestroyEvent(final Vehicle vehicle, final Entity attacker, List drops) { + public VehicleDestroyEvent(final Vehicle vehicle, final Entity attacker) { super(vehicle); this.attacker = attacker; - this.drops = drops; } /** @@ -50,14 +45,4 @@ public class VehicleDestroyEvent extends VehicleEvent implements Cancellable { public static HandlerList getHandlerList() { return handlers; } - - /** - * Gets a list of drops that this vehicle should drop when broken. Changes to this list will - * affect what is actually dropped. This list does not include the contents of the inventory - * if this is a storage minecart; if that's needed, it can be fetched by casting. - * @return A list of drops - */ - public List getDrops() { - return drops; - } } -- cgit v1.2.3