Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-01 02:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Employed a set of consistent rules for getDroppedBlock(type, data) and renamed it to getBlockBagItem.

Browse Source
This commit is contained in:
TomyLobo
2011-11-04 00:41:19 +01:00
parent d9b8285a35
commit 8e368ceef1
3 changed files with 161 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java
View File

@ -26,6 +26,7 @@ import com.sk89q.worldedit.bags.*;
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.blocks.BaseItemStack;
import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.blocks.ItemType;
public class BukkitPlayerBlockBag extends BlockBag {
/**
@ -121,7 +122,7 @@ public class BukkitPlayerBlockBag extends BlockBag {
final int damage = item.getDamage();
int amount = (item instanceof BaseItemStack) ? ((BaseItemStack) item).getAmount() : 1;
assert(amount <= 64);
boolean usesDamageValue = false; // TODO: Use ItemType.usesDamageValue once it's fixed.
boolean usesDamageValue = ItemType.usesDamageValue(id);
if (id == BlockID.AIR) {
throw new IllegalArgumentException("Can't store air block");
@ -137,7 +138,7 @@ public class BukkitPlayerBlockBag extends BlockBag {
if (bukkitItem == null) {
// Delay using up a free slot until we know there are no stacks
// of this item to merge into
if (freeSlot == -1) {
freeSlot = slot;
}