Merge pull request #78 from boraini/fix/target-teleporter

Make target teleporters only check for player-owned protector fields.

Author: boraini

gameserver/src/main/java/brainwine/gameserver/item/interactions/TargetTeleportInteraction.java

@@ -75,12 +75,12 @@ public void interact(Zone zone, Entity entity, int x, int y, Layer layer, Item i
             player.notify("That area hasn't been explored yet.");
             return;
         }
-        
+
         // Check area protection
-        if(!player.isGodMode() && targetZone.isBlockProtected(targetX, targetY, player)) {
+        if(!player.isGodMode() && targetZone.isBlockProtectedByField(targetX, targetY, player)) {
             Player owner = metaBlock.getOwner();
             int setting = metaBlock.getIntProperty("pt");
-            boolean ownerCanEdit = !targetZone.isBlockProtected(targetX, targetY, owner);
+            boolean ownerCanEdit = !targetZone.isBlockProtectedByField(targetX, targetY, owner);
 
             // Check protection entry setting
             if(owner == null || !ownerCanEdit || setting == 0 || (setting == 1 && !owner.isFollowing(player))) {

gameserver/src/main/java/brainwine/gameserver/zone/Zone.java

@@ -685,6 +685,14 @@ public boolean isBlockProtected(int x, int y, Player player, Collection<MetaBloc
             return true;
         }
 
+        return isBlockProtectedByField(x, y, player, fieldBlocks);
+    }
+
+    public boolean isBlockProtectedByField(int x, int y, Player player) {
+        return isBlockProtectedByField(x, y, player, fieldBlocks.values());
+    }
+
+    public boolean isBlockProtectedByField(int x, int y, Player player, Collection<MetaBlock> fieldBlocks) {
         // Check field blocks
         for(MetaBlock fieldBlock : fieldBlocks) {
             Item item = fieldBlock.getItem();
@@ -705,7 +713,7 @@ public boolean isBlockProtected(int x, int y, Player player, Collection<MetaBloc
                 }
             }
         }
-        
+
         return false;
     }