From ca72d9a8df927090fe39fa18ea26e2cb6e24e510 Mon Sep 17 00:00:00 2001
From: sekwah <sekwah41@gmail.com>
Date: Mon, 21 May 2018 21:02:01 +0100
Subject: [PATCH] Removed portal overlap because it was imperfect and one of
 the cheks was also causing an issue. This was better than fixing because
 portal regions may overlap with different triggerblocks

---
 Resources/plugin.yml                               | 2 +-
 pom.xml                                            | 2 +-
 src/com/sekwah/advancedportals/portals/Portal.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/plugin.yml b/Resources/plugin.yml
index 29da80e..5001c4a 100644
--- a/Resources/plugin.yml
+++ b/Resources/plugin.yml
@@ -1,6 +1,6 @@
 main: com.sekwah.advancedportals.AdvancedPortalsPlugin
 name: AdvancedPortals
-version: 0.0.39
+version: 0.0.40
 author: sekwah41
 description: An advanced portals plugin for bukkit.
 commands:
diff --git a/pom.xml b/pom.xml
index e8d5816..0683303 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
     </repositories>
-    <version>0.0.39-snapshot</version>
+    <version>0.0.40-snapshot</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
diff --git a/src/com/sekwah/advancedportals/portals/Portal.java b/src/com/sekwah/advancedportals/portals/Portal.java
index 41dddbb..c363bb8 100644
--- a/src/com/sekwah/advancedportals/portals/Portal.java
+++ b/src/com/sekwah/advancedportals/portals/Portal.java
@@ -179,10 +179,10 @@ public class Portal {
         Location checkpos1 = new Location(pos1.getWorld(), HighX, HighY, HighZ);
         Location checkpos2 = new Location(pos2.getWorld(), LowX, LowY, LowZ);
 
-        if (checkPortalOverlap(checkpos1, checkpos2)) {
+        /*if (checkPortalOverlap(checkpos1, checkpos2)) {
             plugin.getLogger().log(Level.WARNING, "portals must not overlap!");
             return "\u00A7cPortal creation error, portals must not overlap!";
-        }
+        }*/
 
         portalData.getConfig().set(name + ".world", pos1.getWorld().getName());