Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 21:19:00 +01:00
Code Issues Projects Releases Wiki Activity

Added ItemDespawnEvent

Browse Source
This commit is contained in:
Feildmaster 2011-10-17 07:38:03 -05:00 committed by Nathan Adams
parent cc05bea457
commit 6cc56b8c2c
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/minecraft/server/EntityItem.java
View File

@ -1,6 +1,9 @@
package net.minecraft.server;
import org.bukkit.event.player.PlayerPickupItemEvent; // CraftBukkit
// CraftBukkit start
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.player.PlayerPickupItemEvent;
// CraftBukkit End
public class EntityItem extends Entity {
@ -83,6 +86,12 @@ public class EntityItem extends Entity {
++this.e;
++this.b;
if (this.b >= 6000) {
// CraftBukkit start
if(CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
this.b = 0;
return;
}
// CraftBukkit end
this.die();
}
}

13
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -141,7 +141,6 @@ public class CraftEventFactory {
/**
* Player Interact event
*/
public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack) {
if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) {
throw new IllegalArgumentException();
@ -286,6 +285,18 @@ public class CraftEventFactory {
return event;
}
/**
* ItemDespawnEvent
*/
public static ItemDespawnEvent callItemDespawnEvent(EntityItem entityitem) {
org.bukkit.entity.Entity entity = entityitem.getBukkitEntity();
ItemDespawnEvent event = new ItemDespawnEvent(entity, entity.getLocation());
((CraftServer) entity.getServer()).getPluginManager().callEvent(event);
return event;
}
/**
* BlockFadeEvent
*/