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. By: Warren Loo <evilseph@gmail.com>
This commit is contained in:
@@ -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<ItemStack> drops) {
|
||||
super(painting, RemoveCause.ENTITY, drops);
|
||||
public PaintingBreakByEntityEvent(final Painting painting, final Entity remover) {
|
||||
super(painting, RemoveCause.ENTITY);
|
||||
this.remover = remover;
|
||||
}
|
||||
|
||||
|
||||
@@ -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<ItemStack> drops;
|
||||
|
||||
public PaintingBreakEvent(final Painting painting, final RemoveCause cause, List<ItemStack> 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<ItemStack> getDrops() {
|
||||
return drops;
|
||||
}
|
||||
|
||||
/**
|
||||
* An enum to specify the cause of the removal
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user