From 62307c6bcfcc2a1395cdf3de5f555d0cf7c57ab6 Mon Sep 17 00:00:00 2001
From: Sekwah <contact@sekwah.com>
Date: Tue, 6 Jul 2021 23:34:06 +0100
Subject: [PATCH] fix: Issue where portal events activate too early in survival

Fixes #228
---
 .../bukkit/AdvancedPortalsPlugin.java         |  4 ++--
 .../bukkit/listeners/Listeners.java           | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsPlugin.java b/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsPlugin.java
index 58c5555..dfbd10e 100644
--- a/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsPlugin.java
+++ b/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsPlugin.java
@@ -73,8 +73,8 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
 
         for (Player player:
                 this.getServer().getOnlinePlayers()) {
-            player.removeMetadata("hasWarped", this);
-            player.removeMetadata("lavaWarped", this);
+            player.removeMetadata(Listeners.HAS_WARPED, this);
+            player.removeMetadata(Listeners.LAVA_WARPED, this);
         }
 
         // thanks to the new config accessor code the config.saveDefaultConfig(); will now
diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java
index cc47dc4..da106a4 100644
--- a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java
+++ b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java
@@ -34,6 +34,9 @@ public class Listeners implements Listener {
 
     private final AdvancedPortalsPlugin plugin;
 
+    public static String HAS_WARPED = "hasWarped";
+    public static String LAVA_WARPED = "lavaWarped";
+
     @SuppressWarnings("deprecation")
     public Listeners(AdvancedPortalsPlugin plugin) {
         this.plugin = plugin;
@@ -133,14 +136,11 @@ public class Listeners implements Listener {
                 for (Location loc : locations) {
                     if (delayed ? Portal.locationInPortal(portal, loc, 1)
                             : Portal.locationInPortalTrigger(portal, loc)) {
-                        if (portal.getTriggers().contains(Material.NETHER_PORTAL)) {
-                            if (player.getGameMode().equals(GameMode.CREATIVE)) {
-                                player.setMetadata("hasWarped", new FixedMetadataValue(plugin, true));
-                                Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new RemoveWarpData(player), 10);
-                            }
-                        }
+
+                        player.setMetadata(HAS_WARPED, new FixedMetadataValue(plugin, true));
+                        Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new RemoveWarpData(player), 10);
                         if (portal.getTriggers().contains(Material.LAVA)) {
-                            player.setMetadata("lavaWarped", new FixedMetadataValue(plugin, true));
+                            player.setMetadata(LAVA_WARPED, new FixedMetadataValue(plugin, true));
                             Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, new RemoveLavaData(player), 10);
                         }
                         if (portal.inPortal.contains(player.getUniqueId()))
@@ -231,7 +231,7 @@ public class Listeners implements Listener {
 
         @Override
         public void run() {
-            player.removeMetadata("lavaWarped", plugin);
+            player.removeMetadata(LAVA_WARPED, plugin);
             player.setFireTicks(0);
         }
     }
@@ -247,7 +247,7 @@ public class Listeners implements Listener {
         @Override
         public void run() {
             if (player != null && player.isOnline()) {
-                player.removeMetadata("hasWarped", plugin);
+                player.removeMetadata(HAS_WARPED, plugin);
             }
         }
     }
@@ -263,7 +263,7 @@ public class Listeners implements Listener {
         if (event.getEntity() instanceof Player && (event.getCause() == EntityDamageEvent.DamageCause.LAVA
                 || event.getCause() == EntityDamageEvent.DamageCause.FIRE
                 || event.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK)) {
-            if (event.getEntity().hasMetadata("lavaWarped")
+            if (event.getEntity().hasMetadata(LAVA_WARPED)
                     | Portal.inPortalTriggerRegion(event.getEntity().getLocation()))
                 event.setCancelled(true);
         }
@@ -276,14 +276,14 @@ public class Listeners implements Listener {
         }
         Player player = event.getPlayer();
 
-        if (!player.hasMetadata("hasWarped")) {
+        if (!player.hasMetadata(HAS_WARPED)) {
             Location loc = event.getFrom();
             Location eyeLoc = new Location(loc.getWorld(), loc.getX(), loc.getY() + player.getEyeHeight(), loc.getZ());
 
             checkTriggerLocations(player, true, loc, eyeLoc);
         }
 
-        if (player.hasMetadata("hasWarped") | Portal.inPortalRegion(event.getFrom(), 1))
+        if (player.hasMetadata(HAS_WARPED) | Portal.inPortalRegion(event.getFrom(), 1))
             event.setCancelled(true);
     }