From f34ffe89162eae046d8c20f1dd2ec2eae0c5286e Mon Sep 17 00:00:00 2001
From: Alastair Hawkes <alastair.hawkes@gmail.com>
Date: Thu, 13 Apr 2017 14:41:16 +0100
Subject: [PATCH] Fixed error message for no destination and a command

---
 src/com/sekwah/advancedportals/portals/AdvancedPortal.java | 6 +++++-
 src/com/sekwah/advancedportals/portals/Portal.java         | 5 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/com/sekwah/advancedportals/portals/AdvancedPortal.java b/src/com/sekwah/advancedportals/portals/AdvancedPortal.java
index 3f8453d..fffb945 100644
--- a/src/com/sekwah/advancedportals/portals/AdvancedPortal.java
+++ b/src/com/sekwah/advancedportals/portals/AdvancedPortal.java
@@ -1,11 +1,12 @@
 package com.sekwah.advancedportals.portals;
 
 import com.sekwah.advancedportals.api.portaldata.PortalArg;
-import java.util.HashSet;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 
+import java.util.HashSet;
+
 public class AdvancedPortal {
 
     public Material trigger = null;
@@ -62,4 +63,7 @@ public class AdvancedPortal {
         return null;
     }
 
+    public boolean hasArg(String arg) {
+        return this.getArg(arg) != null;
+    }
 }
diff --git a/src/com/sekwah/advancedportals/portals/Portal.java b/src/com/sekwah/advancedportals/portals/Portal.java
index 9bb1c1d..32435a3 100644
--- a/src/com/sekwah/advancedportals/portals/Portal.java
+++ b/src/com/sekwah/advancedportals/portals/Portal.java
@@ -383,7 +383,7 @@ public class Portal {
             }
         }
         cooldown.put(player, System.currentTimeMillis());
-        boolean showFailMessage = true;
+        boolean showFailMessage = !portal.hasArg("command.1");
 
         //plugin.getLogger().info(portal.portalName + ":" + portal.destiation);
         boolean warped = false;
@@ -414,8 +414,7 @@ public class Portal {
             }
         }
 
-        if (portal.getArg("command.1") != null) {
-            showFailMessage = false;
+        if (!portal.hasArg("command.1")) {
             int commandLine = 1;
             String command = portal.getArg("command." + commandLine);//portalData.getConfig().getString(portal.portalName+ ".portalArgs.command." + commandLine);
             do {