From 3341574e027cd70574bfe972725c72363a6c7ae1 Mon Sep 17 00:00:00 2001 From: DarkLiKally Date: Fri, 25 Feb 2011 12:22:58 +0100 Subject: [PATCH] Replaced some tabs with spaces --- config.yml | 8 ++++---- plugin.yml | 3 +-- .../sk89q/worldguard/bukkit/WorldGuardBlockListener.java | 2 +- .../sk89q/worldguard/protection/regions/AreaFlags.java | 7 ++++++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config.yml b/config.yml index de040869..ce5878a5 100644 --- a/config.yml +++ b/config.yml @@ -84,10 +84,10 @@ regions: waterflow: on iconomy: - enable: on - buy-on-claim: on - # Price per Block for buying on claim - buy-on-claim-price: 2 + enable: on + buy-on-claim: on + # Price per Block for buying on claim + buy-on-claim-price: 2 blacklist: logging: diff --git a/plugin.yml b/plugin.yml index 6aacfac3..6fa6269f 100644 --- a/plugin.yml +++ b/plugin.yml @@ -37,5 +37,4 @@ commands: aliases: tpr buyregion: description: Buy a buyable region - usage: / [info] - \ No newline at end of file + usage: / [info] \ No newline at end of file diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java index 6ad4fee0..33917d60 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java @@ -68,7 +68,7 @@ public void onBlockDamage(BlockDamageEvent event) { Player player = event.getPlayer(); Block blockDamaged = event.getBlock(); - + if (plugin.useRegions && blockDamaged.getType() == Material.CAKE_BLOCK) { Vector pt = toVector(blockDamaged); diff --git a/src/com/sk89q/worldguard/protection/regions/AreaFlags.java b/src/com/sk89q/worldguard/protection/regions/AreaFlags.java index 993da1f4..4fe5501e 100644 --- a/src/com/sk89q/worldguard/protection/regions/AreaFlags.java +++ b/src/com/sk89q/worldguard/protection/regions/AreaFlags.java @@ -138,7 +138,12 @@ private Map getFlagData(String name) * @return State */ public State get(String flag) { - State state = State.valueOf(getFlagData("states").get(flag)); + String value = getFlagData("states").get(flag); + if(value == null) + { + return State.NONE; + } + State state = State.valueOf(value); if (state == null) { return State.NONE; }