From 3366e9705a0f9a993005bcba9d2622e1d2fd4203 Mon Sep 17 00:00:00 2001
From: Alastair <alastair.hawkes@gmail.com>
Date: Fri, 14 Jul 2017 00:15:08 +0100
Subject: [PATCH] Ch

---
 Resources/plugin.yml                                 |  2 +-
 pom.xml                                              |  2 +-
 .../advancedportals/AdvancedPortalsCommand.java      |  2 +-
 .../sekwah/advancedportals/listeners/Listeners.java  | 12 +++++++-----
 src/com/sekwah/advancedportals/portals/Portal.java   |  9 +++++----
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Resources/plugin.yml b/Resources/plugin.yml
index dda033a3..6da9d42c 100644
--- a/Resources/plugin.yml
+++ b/Resources/plugin.yml
@@ -1,6 +1,6 @@
 main: com.sekwah.advancedportals.AdvancedPortalsPlugin
 name: AdvancedPortals
-version: 0.0.33
+version: 0.0.34
 author: sekwah41
 description: An advanced portals plugin for bukkit.
 commands:
diff --git a/pom.xml b/pom.xml
index 69220cdd..8194bd1c 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.33-snapshot</version>
+    <version>0.0.34-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/AdvancedPortalsCommand.java b/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java
index cbd3b225..c6b1f435 100644
--- a/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java
+++ b/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java
@@ -193,7 +193,7 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
                                 Location pos2 = new Location(world, player.getMetadata("Pos2X").get(0).asInt(), player.getMetadata("Pos2Y").get(0).asInt(), player.getMetadata("Pos2Z").get(0).asInt());
 
                                 ConfigAccessor desticonfig = new ConfigAccessor(plugin, "destinations.yml");
-                                String destiPosX = desticonfig.getConfig().getString(destination + ".pos1.X");
+                                String destiPosX = desticonfig.getConfig().getString(destination + ".pos.X");
 
                                 if (!Portal.portalExists(portalName)) {
 
diff --git a/src/com/sekwah/advancedportals/listeners/Listeners.java b/src/com/sekwah/advancedportals/listeners/Listeners.java
index 63e1c4ee..6c62c9a0 100644
--- a/src/com/sekwah/advancedportals/listeners/Listeners.java
+++ b/src/com/sekwah/advancedportals/listeners/Listeners.java
@@ -18,10 +18,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerPortalEvent;
+import org.bukkit.event.player.*;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.FixedMetadataValue;
 
@@ -74,7 +71,12 @@ public class Listeners implements Listener {
 
     @EventHandler
     public void onJoinEvent(PlayerJoinEvent event) {
-        Portal.cooldown.put(event.getPlayer(), System.currentTimeMillis());
+        Portal.cooldown.put(event.getPlayer().getName(), System.currentTimeMillis());
+    }
+
+    @EventHandler
+    public void onLeaveEvent(PlayerQuitEvent event) {
+        Portal.cooldown.remove(event.getPlayer().getName());
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
diff --git a/src/com/sekwah/advancedportals/portals/Portal.java b/src/com/sekwah/advancedportals/portals/Portal.java
index 64d9a6eb..f8c7b090 100644
--- a/src/com/sekwah/advancedportals/portals/Portal.java
+++ b/src/com/sekwah/advancedportals/portals/Portal.java
@@ -22,7 +22,7 @@ import java.util.logging.Level;
 
 public class Portal {
 
-    public static HashMap<Player, Long> cooldown = new HashMap<Player, Long>();
+    public static HashMap<String, Long> cooldown = new HashMap<String, Long>();
     // Config values
     public static boolean portalsActive = false;
     public static AdvancedPortal[] portals = new AdvancedPortal[0];
@@ -125,6 +125,7 @@ public class Portal {
             portalsActive = true;
         } else {
             portalsActive = false;
+            portals = new AdvancedPortal[0];
         }
     }
 
@@ -387,8 +388,8 @@ public class Portal {
             return false;
         }
 
-        if (cooldown.get(player) != null) {
-            int diff = (int) ((System.currentTimeMillis() - cooldown.get(player)) / 1000);
+        if (cooldown.get(player.getName()) != null) {
+            int diff = (int) ((System.currentTimeMillis() - cooldown.get(player.getName())) / 1000);
             if (diff < cooldelay) {
                 player.sendMessage(ChatColor.RED + "Please wait " + ChatColor.YELLOW + (cooldelay - diff) + ChatColor.RED + " seconds until attempting to teleport again.");
                 failSound(player, portal);
@@ -396,7 +397,7 @@ public class Portal {
                 return false;
             }
         }
-        cooldown.put(player, System.currentTimeMillis());
+        cooldown.put(player.getName(), System.currentTimeMillis());
         boolean showFailMessage = !portal.hasArg("command.1");
 
         //plugin.getLogger().info(portal.getName() + ":" + portal.getDestiation());