Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-06-29 07:55:05 +02:00
Code Issues Projects Releases Wiki Activity

Updated for Bukkit 1.0 and handling new 1.0 block types in USE flag

Browse Source
This commit is contained in:
zml2008 2011-11-30 18:53:01 -08:00
parent 944539453e
commit f904c91443
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -42,7 +42,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>1.0.0-R1-SNAPSHOT</version>
</dependency>
<!-- Additional libraries -->

51
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
View File

@ -24,6 +24,7 @@
import java.util.Set;
import java.util.logging.Logger;
import com.sk89q.worldguard.blacklist.events.ItemDetectHaveBlacklistEvent;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
@ -525,7 +526,9 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
|| type == Material.JUKEBOX
|| type == Material.DISPENSER
|| type == Material.FURNACE
|| type == Material.BURNING_FURNACE)
|| type == Material.BURNING_FURNACE
|| type == Material.BREWING_STAND
|| type == Material.ENCHANTMENT_TABLE)
&& wcfg.removeInfiniteStacks
&& !plugin.hasPermission(player, "worldguard.override.infinite-stack")) {
for (int slot = 0; slot < 40; slot++) {
@ -569,7 +572,7 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
Block placedOn = block.getRelative(event.getBlockFace());
if (!plugin.getGlobalRegionManager().hasBypass(player, world)
&& !plugin.getGlobalRegionManager().allows(
DefaultFlag.TNT, placedOn.getLocation())) {
DefaultFlag.TNT, placedOn.getLocation())) {
event.setUseItemInHand(Result.DENY);
event.setCancelled(true);
}
@ -600,7 +603,8 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
|| type == Material.JUKEBOX //stores the (arguably) most valuable item
|| type == Material.DISPENSER
|| type == Material.FURNACE
|| type == Material.BURNING_FURNACE) {
|| type == Material.BURNING_FURNACE
|| type == Material.BREWING_STAND) {
if (!plugin.getGlobalRegionManager().hasBypass(player, world)
&& !set.allows(DefaultFlag.CHEST_ACCESS)
&& !set.canBuild(localPlayer)) {
@ -612,14 +616,20 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
}
if (type == Material.LEVER
|| type == Material.STONE_BUTTON
|| type == Material.NOTE_BLOCK
|| type == Material.DIODE_BLOCK_OFF
|| type == Material.DIODE_BLOCK_ON
|| type == Material.WOODEN_DOOR
|| type == Material.TRAP_DOOR
|| type == Material.FENCE_GATE
|| type == Material.WORKBENCH) {
|| type == Material.STONE_BUTTON
|| type == Material.NOTE_BLOCK
|| type == Material.DIODE_BLOCK_OFF
|| type == Material.DIODE_BLOCK_ON
|| type == Material.WOODEN_DOOR
|| type == Material.TRAP_DOOR
|| type == Material.FENCE_GATE
|| type == Material.JUKEBOX //stores the (arguably) most valuable item
|| type == Material.DISPENSER
|| type == Material.FURNACE
|| type == Material.BURNING_FURNACE
|| type == Material.WORKBENCH
|| type == Material.BREWING_STAND
|| type == Material.ENCHANTMENT_TABLE) {
if (!plugin.getGlobalRegionManager().hasBypass(player, world)
&& !set.allows(DefaultFlag.USE)
&& !set.canBuild(localPlayer)) {
@ -664,10 +674,12 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
}
if (wcfg.getBlacklist() != null) {
if((block.getType() != Material.CHEST
&& block.getType() != Material.DISPENSER
&& block.getType() != Material.FURNACE
&& block.getType() != Material.BURNING_FURNACE)) {
if(type != Material.CHEST
&& type != Material.DISPENSER
&& type != Material.FURNACE
&& type != Material.BURNING_FURNACE
&& type != Material.BREWING_STAND
&& type != Material.ENCHANTMENT_TABLE) {
if (!wcfg.getBlacklist().check(
new ItemUseBlacklistEvent(plugin.wrapPlayer(player), toVector(block),
item.getTypeId()), false, false)) {
@ -698,10 +710,11 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
}
}
if ((block.getType() == Material.CHEST
|| block.getType() == Material.DISPENSER
|| block.getType() == Material.FURNACE
|| block.getType() == Material.BURNING_FURNACE)) {
if ((type == Material.CHEST
|| type == Material.DISPENSER
|| type == Material.FURNACE
|| type == Material.BURNING_FURNACE
|| type == Material.ENCHANTMENT_TABLE)) {
if (wcfg.isChestProtected(block, player)) {
player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");