Moves activeTime and openTime into the StargateGateConfig
This commit is contained in:
parent
deba2e5c2c
commit
b7998023f5
@ -60,10 +60,6 @@ public class Stargate extends JavaPlugin {
|
|||||||
public static final ConcurrentLinkedQueue<Portal> activePortalsQueue = new ConcurrentLinkedQueue<>();
|
public static final ConcurrentLinkedQueue<Portal> activePortalsQueue = new ConcurrentLinkedQueue<>();
|
||||||
private static final Queue<ChunkUnloadRequest> chunkUnloadQueue = new PriorityQueue<>();
|
private static final Queue<ChunkUnloadRequest> chunkUnloadQueue = new PriorityQueue<>();
|
||||||
|
|
||||||
//Amount of seconds before deactivating/closing portals
|
|
||||||
private static final int activeTime = 10;
|
|
||||||
private static final int openTime = 10;
|
|
||||||
|
|
||||||
private static Logger logger;
|
private static Logger logger;
|
||||||
public static Server server;
|
public static Server server;
|
||||||
public static Stargate stargate;
|
public static Stargate stargate;
|
||||||
@ -154,24 +150,6 @@ public class Stargate extends JavaPlugin {
|
|||||||
return stargateGateConfig.destroyedByExplosion();
|
return stargateGateConfig.destroyedByExplosion();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the amount of seconds a portal should be open before automatically closing
|
|
||||||
*
|
|
||||||
* @return <p>The open time of a gate</p>
|
|
||||||
*/
|
|
||||||
public static int getOpenTime() {
|
|
||||||
return openTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the amount of seconds a portal should be active before automatically deactivating
|
|
||||||
*
|
|
||||||
* @return <p>The active time of a gate</p>
|
|
||||||
*/
|
|
||||||
public static int getActiveTime() {
|
|
||||||
return activeTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the logger used for logging to the console
|
* Gets the logger used for logging to the console
|
||||||
*
|
*
|
||||||
|
@ -21,6 +21,8 @@ public final class StargateGateConfig {
|
|||||||
private boolean destroyExplosion = false;
|
private boolean destroyExplosion = false;
|
||||||
private ChatColor signColor;
|
private ChatColor signColor;
|
||||||
private String defaultGateNetwork = "central";
|
private String defaultGateNetwork = "central";
|
||||||
|
private static final int activeTime = 10;
|
||||||
|
private static final int openTime = 10;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Instantiates a new stargate config
|
* Instantiates a new stargate config
|
||||||
@ -31,6 +33,24 @@ public final class StargateGateConfig {
|
|||||||
loadGateConfig(newConfig);
|
loadGateConfig(newConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the amount of seconds a portal should be open before automatically closing
|
||||||
|
*
|
||||||
|
* @return <p>The open time of a gate</p>
|
||||||
|
*/
|
||||||
|
public int getOpenTime() {
|
||||||
|
return openTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the amount of seconds a portal should be active before automatically deactivating
|
||||||
|
*
|
||||||
|
* @return <p>The active time of a gate</p>
|
||||||
|
*/
|
||||||
|
public int getActiveTime() {
|
||||||
|
return activeTime;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the maximum number of gates allowed on each network
|
* Gets the maximum number of gates allowed on each network
|
||||||
*
|
*
|
||||||
|
@ -20,7 +20,7 @@ public class StarGateThread implements Runnable {
|
|||||||
if (portal.getOptions().isAlwaysOn() || !portal.isOpen()) {
|
if (portal.getOptions().isAlwaysOn() || !portal.isOpen()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (time > portal.getActivatedTime() + Stargate.getOpenTime()) {
|
if (time > portal.getActivatedTime() + Stargate.getGateConfig().getOpenTime()) {
|
||||||
portal.getPortalOpener().closePortal(false);
|
portal.getPortalOpener().closePortal(false);
|
||||||
iterator.remove();
|
iterator.remove();
|
||||||
}
|
}
|
||||||
@ -31,7 +31,7 @@ public class StarGateThread implements Runnable {
|
|||||||
if (!portal.getPortalActivator().isActive()) {
|
if (!portal.getPortalActivator().isActive()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (time > portal.getActivatedTime() + Stargate.getActiveTime()) {
|
if (time > portal.getActivatedTime() + Stargate.getGateConfig().getActiveTime()) {
|
||||||
portal.getPortalActivator().deactivate();
|
portal.getPortalActivator().deactivate();
|
||||||
iterator.remove();
|
iterator.remove();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user