Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly handle null and air items. Fixes BUKKIT-435 and BUKKIT-550

Browse Source 
We'll probably want to implement an ItemStack.EMPTY and return that
instead of NULL in the near future.
This commit is contained in:
EvilSeph
2012-01-20 02:26:26 -05:00
parent 4b0f819af2
commit 76d7a1ce1d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@@ -3,6 +3,8 @@ package org.bukkit.craftbukkit;
import com.google.common.collect.MapMaker;
import java.io.File;
import java.util.Set;
import org.apache.commons.lang.Validate;
import org.bukkit.craftbukkit.entity.*;
import org.bukkit.entity.*;
import org.bukkit.entity.Entity;
@@ -299,6 +301,8 @@ public class CraftWorld implements World {
}
public org.bukkit.entity.Item dropItem(Location loc, ItemStack item) {
Validate.notNull(item, "Cannot drop a Null item.");
Validate.isTrue(item.getTypeId() != 0, "Cannot drop AIR.");
CraftItemStack clone = new CraftItemStack(item);
EntityItem entity = new EntityItem(world, loc.getX(), loc.getY(), loc.getZ(), clone.getHandle());
entity.pickupDelay = 10;