Prevent non-residents from making protections in Towny towns when cor…

…e.townyBorders is enabled
pop4959 · Apr 22, 2019 · c1d515f · c1d515f
1 parent f4fa4ae
commit c1d515f
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/main/java/com/griefcraft/modules/pluginsupport/Towny.java b/src/main/java/com/griefcraft/modules/pluginsupport/Towny.java
@@ -189,15 +189,14 @@ public void onRegisterProtection(LWCProtectionRegisterEvent event) {
             return;
         }
 
-        // attempt to get the town block
-        @SuppressWarnings("unused")
-        TownBlock townBlock;
-
         try {
-            townBlock = world.getTownBlock(Coord.parseCoord(block));
+            TownBlock townBlock = world.getTownBlock(Coord.parseCoord(block));
+            // If an exception is not thrown, we are in a town.
+            if (!townBlock.getTown().hasResident(event.getPlayer().getName())) {
+                trigger(event);
+            }
         } catch (Exception e) {
-            // No world, don't let them protect it!
-            trigger(event);
+            // If an exception is thrown, we are not in a town (do nothing).
         }
     }