From 4a19a941ff44a425f778e6d5995a56ce50d9e5c3 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sun, 25 Dec 2011 04:23:54 +0800
Subject: [PATCH] Add support for world-level hide/show in visibleregions and
 hiddenregions using "world:<worldname>" syntax.

---
 .../org/dynmap/worldguard/DynmapWorldGuardPlugin.java     | 8 ++++----
 src/main/resources/config.yml                             | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
index 1869d51..a320324 100644
--- a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
+++ b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
@@ -115,14 +115,14 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
         return v;
     }
     
-    private boolean isVisible(String id) {
+    private boolean isVisible(String id, String worldname) {
         if((visible != null) && (visible.size() > 0)) {
-            if(visible.contains(id) == false) {
+            if((visible.contains(id) == false) && (visible.contains("world:" + worldname) == false)) {
                 return false;
             }
         }
         if((hidden != null) && (hidden.size() > 0)) {
-            if(hidden.contains(id))
+            if(hidden.contains(id) || hidden.contains("world:" + worldname))
                 return false;
         }
         return true;
@@ -183,7 +183,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
         String desc = formatInfoWindow(region);
         
         /* Handle areas */
-        if(isVisible(region.getId())) {
+        if(isVisible(region.getId(), world.getName())) {
             String id = region.getId();
             String tn = region.getTypeName();
             BlockVector l0 = region.getMinimumPoint();
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 63ec0f5..d2c3cbc 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -27,9 +27,11 @@ regionstyle:
   fillOpacity: 0.35
   
 # Optional setting to limit which regions to show, by name - if commented out, all regions are shown
+# To show all regions on a given world, add 'world:<worldname>' to the list
 visibleregions: [ ]
   
 # Optional setting to hide specific regions, by name
+# To hide all regions on a given world, add 'world:<worldname>' to the list
 hiddenregions: [ ]
   
 # Optional per-region overrides for regionstyle (any defined replace those in regionstyle)