Merge pull request #504 from Glitchfinder/master

Making it impossible to attempt to drop air
This commit is contained in:
GJ 2013-01-14 12:10:30 -08:00
commit e7aafb7242

View File

@ -281,13 +281,15 @@ public class Misc {
*/ */
public static void dropItem(Location location, ItemStack itemStack) { public static void dropItem(Location location, ItemStack itemStack) {
if(itemStack.getType() == Material.AIR)
return;
// We can't get the item until we spawn it and we want to make it cancellable, so we have a custom event. // We can't get the item until we spawn it and we want to make it cancellable, so we have a custom event.
McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack); McMMOItemSpawnEvent event = new McMMOItemSpawnEvent(location, itemStack);
mcMMO.p.getServer().getPluginManager().callEvent(event); mcMMO.p.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled())
return; return;
}
Item newItem = location.getWorld().dropItemNaturally(location, itemStack); Item newItem = location.getWorld().dropItemNaturally(location, itemStack);