From 047f9a75b99da1767bd8cbb5e79845c87ab91ec6 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 27 Jun 2016 17:45:19 +1000
Subject: [PATCH] Fix #1222

---
 .../main/java/com/intellectualcrafters/plot/object/Plot.java  | 2 +-
 .../intellectualcrafters/plot/util/expiry/ExpireManager.java  | 2 +-
 .../intellectualcrafters/plot/util/expiry/ExpirySettings.java | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpirySettings.java

diff --git a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
index b2f43b91e..d5cd9b231 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
@@ -2681,7 +2681,7 @@ public class Plot {
                 greaterPlot.setMerged(3, true);
                 lesserPlot.mergeData(greaterPlot);
                 if (removeRoads) {
-                    Plot diagonal = greaterPlot.getRelative(1);
+                    Plot diagonal = greaterPlot.getRelative(2);
                     if (diagonal.getMerged(7)) {
                         lesserPlot.removeRoadSouthEast();
                     }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpireManager.java
index a67a95bed..a78ca1b5c 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpireManager.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpireManager.java
@@ -300,7 +300,7 @@ public class ExpireManager {
                         }
                     }, 86400000);
                 } else {
-                    TaskManager.runTaskLaterAsync(this, 20);
+                    TaskManager.runTaskLaterAsync(this, 20 * 10);
                 }
             }
         });
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpirySettings.java b/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpirySettings.java
deleted file mode 100644
index 24ba134d3..000000000
--- a/Core/src/main/java/com/intellectualcrafters/plot/util/expiry/ExpirySettings.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.intellectualcrafters.plot.util.expiry;
-
-public class ExpirySettings {
-}