From 177b33154fb39285ea36daf1920f06baf9cd2346 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Tue, 27 Sep 2016 00:56:39 +1000
Subject: [PATCH] Multiple

Fixes #1362
Fixes border id for PlotMe converter
---
 .../database/plotme/LikePlotMeConverter.java      |  4 +++-
 .../bukkit/listeners/PlayerEvents.java            | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java b/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java
index 13dbc496d..ffee994ad 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java
@@ -117,8 +117,10 @@ public class LikePlotMeConverter {
         PS.get().worlds.set("worlds." + world + ".plot.height", height);
         int plotSize = plotmeDgYml.getInt("worlds." + plotMeWorldName + ".PlotSize", 32); //
         PS.get().worlds.set("worlds." + world + ".plot.size", plotSize);
-        String wallblock = plotmeDgYml.getString("worlds." + plotMeWorldName + ".WallBlock", "44"); //
+        String wallblock = plotmeDgYml.getString("worlds." + plotMeWorldName + ".WallBlock", plotmeDgYml.getString("worlds." + plotMeWorldName + ".UnclaimedBorder", "44")); //
         PS.get().worlds.set("worlds." + world + ".wall.block", wallblock);
+        String claimed = plotmeDgYml.getString("worlds." + plotMeWorldName + ".ProtectedWallBlock", "44:1"); //
+        PS.get().worlds.set("worlds." + world + ".wall.block_claimed", claimed);
         String floor = plotmeDgYml.getString("worlds." + plotMeWorldName + ".PlotFloorBlock", "2"); //
         PS.get().worlds.set("worlds." + world + ".plot.floor", Collections.singletonList(floor));
         String filling = plotmeDgYml.getString("worlds." + plotMeWorldName + ".FillBlock", "3"); //
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
index e776a19e1..3eb4a85b3 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -202,8 +202,19 @@ public class PlayerEvents extends PlotListener implements Listener {
                     return;
                 }
                 if (Settings.Redstone.DISABLE_OFFLINE) {
-                    if (UUIDHandler.getPlayer(plot.owner) == null) {
-                        boolean disable = true;
+                    boolean disable;
+                    if (plot.isMerged()) {
+                        disable = true;
+                        for (UUID owner : plot.getOwners()) {
+                            if (UUIDHandler.getPlayer(owner) != null) {
+                                disable = false;
+                                break;
+                            }
+                        }
+                    } else {
+                        disable = UUIDHandler.getPlayer(plot.owner) == null;
+                    }
+                    if (disable) {
                         for (UUID trusted : plot.getTrusted()) {
                             if (UUIDHandler.getPlayer(trusted) != null) {
                                 disable = false;