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

Updated stack command to use ItemType.usesDamageValue().

Browse Source
This commit is contained in:
sk89q 2011-01-16 09:15:16 -08:00
parent cb1c1efc35
commit c82ee055e7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
View File

@ -269,7 +269,8 @@ public boolean handleCommand(PlayerChatEvent event) {
// Same type? // Same type?
// Blocks store their color in the damage value // Blocks store their color in the damage value
if (item2.getTypeId() == item.getTypeId() && if (item2.getTypeId() == item.getTypeId() &&
(item.getTypeId() != 35 || item.getDamage() == item2.getDamage())) { (!ItemType.usesDamageValue(item.getTypeId())
|| item.getDamage() == item2.getDamage())) {
// This stack won't fit in the parent stack // This stack won't fit in the parent stack
if (item2.getAmount() > needed) { if (item2.getAmount() > needed) {
item.setAmount(64); item.setAmount(64);