Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-27 12:46:11 +01:00
Code Issues Projects Releases Wiki Activity

Last little useless item handling change before 1.3 release.

Browse Source
This commit is contained in:
taoneill 2011-03-21 02:19:52 -04:00
parent 1c7bf3c7f2
commit e32745662b
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
war/src/main/java/bukkit/tommytony/war/WarPlayerListener.java
View File

@ -108,22 +108,20 @@ public class WarPlayerListener extends PlayerListener {
} else { } else {
Item item = event.getItemDrop(); Item item = event.getItemDrop();
if(item instanceof CraftItem) { ItemStack itemStack = item.getItemStack();
ItemStack itemStack = ((CraftItem)item).getItemStack(); if(itemStack != null
if(itemStack != null && itemStack.getType() == team.getKind().getMaterial()
&& itemStack.getType() == team.getKind().getMaterial() && itemStack.getData().getData() == team.getKind().getData()) {
&& itemStack.getData().getData() == team.getKind().getData()) { // Can't drop your team's kind block
// Can't drop your team's kind block war.badMsg(player, "Can't drop " + team.getName() + " block blocks.");
war.badMsg(player, "Can't drop " + team.getName() + " block blocks."); event.setCancelled(true);
event.setCancelled(true); return;
return; }
}
if(zone.isNearWall(player.getLocation()) && itemStack != null) {
if(zone.isNearWall(player.getLocation()) && itemStack != null) { war.badMsg(player, "Can't drop items near the zone border!");
war.badMsg(player, "Can't drop items near the zone border!"); event.setCancelled(true);
event.setCancelled(true); return;
return;
}
} }
} }
} }