From 4b42d4914a1e0975d515cba49b985a16f8aede3c Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 <kristian.knarvik@knett.no> Date: Wed, 20 Oct 2021 20:57:00 +0200 Subject: [PATCH] Renames openTime to activatedTime, though it's kind of used for both opening and activation --- .../java/net/knarcraft/stargate/portal/Portal.java | 8 ++++---- .../knarcraft/stargate/portal/PortalOpener.java | 14 +++++++------- .../knarcraft/stargate/thread/StarGateThread.java | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/knarcraft/stargate/portal/Portal.java b/src/main/java/net/knarcraft/stargate/portal/Portal.java index 2ea0332..3ff1259 100644 --- a/src/main/java/net/knarcraft/stargate/portal/Portal.java +++ b/src/main/java/net/knarcraft/stargate/portal/Portal.java @@ -130,15 +130,15 @@ public class Portal { } /** - * Gets the time this portal opened + * Gets the time this portal was activated/opened * * <p>The time is given in the equivalent of a Unix timestamp. It's used to decide when a portal times out and * automatically closes.</p> * - * @return <p>The time this portal opened</p> + * @return <p>The time this portal was activated/opened</p> */ - public long getOpenTime() { - return portalOpener.getOpenTime(); + public long getActivatedTime() { + return portalOpener.getActivatedTime(); } /** diff --git a/src/main/java/net/knarcraft/stargate/portal/PortalOpener.java b/src/main/java/net/knarcraft/stargate/portal/PortalOpener.java index c169c6f..3a26834 100644 --- a/src/main/java/net/knarcraft/stargate/portal/PortalOpener.java +++ b/src/main/java/net/knarcraft/stargate/portal/PortalOpener.java @@ -17,7 +17,7 @@ public class PortalOpener { private boolean isOpen = false; private final Portal portal; - private long openTime; + private long activatedTime; private Player player; private final PortalActivator portalActivator; @@ -44,10 +44,10 @@ public class PortalOpener { /** * Sets the time when this portal was activated * - * @param openTime <p>Unix timestamp when portal was activated</p> + * @param activatedTime <p>Unix timestamp when portal was activated</p> */ - public void setOpenTime(long openTime) { - this.openTime = openTime; + public void setActivatedTime(long activatedTime) { + this.activatedTime = activatedTime; } /** @@ -99,7 +99,7 @@ public class PortalOpener { private void updatePortalOpenState(Player openFor) { //Update the open state of this portal isOpen = true; - openTime = System.currentTimeMillis() / 1000; + activatedTime = System.currentTimeMillis() / 1000; Stargate.openPortalsQueue.add(portal); Stargate.activePortalsQueue.remove(portal); PortalOptions options = portal.getOptions(); @@ -196,8 +196,8 @@ public class PortalOpener { * * @return <p>The time this portal activator's portal opened</p> */ - public long getOpenTime() { - return openTime; + public long getActivatedTime() { + return activatedTime; } } diff --git a/src/main/java/net/knarcraft/stargate/thread/StarGateThread.java b/src/main/java/net/knarcraft/stargate/thread/StarGateThread.java index 6ddd63e..c2ad0a4 100644 --- a/src/main/java/net/knarcraft/stargate/thread/StarGateThread.java +++ b/src/main/java/net/knarcraft/stargate/thread/StarGateThread.java @@ -20,7 +20,7 @@ public class StarGateThread implements Runnable { if (portal.getOptions().isAlwaysOn() || !portal.isOpen()) { continue; } - if (time > portal.getOpenTime() + Stargate.getOpenTime()) { + if (time > portal.getActivatedTime() + Stargate.getOpenTime()) { portal.getPortalOpener().closePortal(false); iterator.remove(); } @@ -31,7 +31,7 @@ public class StarGateThread implements Runnable { if (!portal.getPortalActivator().isActive()) { continue; } - if (time > portal.getOpenTime() + Stargate.getActiveTime()) { + if (time > portal.getActivatedTime() + Stargate.getActiveTime()) { portal.getPortalActivator().deactivate(); iterator.remove(); }