EpicKnarvik97/Stargate
EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Moves activeTime and openTime into the StargateGateConfig

Browse Source
This commit is contained in:
Kristian Knarvik 2021-10-23 14:35:07 +02:00
parent deba2e5c2c
commit b7998023f5
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/knarcraft/stargate/Stargate.java
View File

@ -60,10 +60,6 @@ public class Stargate extends JavaPlugin {
public static final ConcurrentLinkedQueue<Portal> activePortalsQueue = new ConcurrentLinkedQueue<>();
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;
public static Server server;
public static Stargate stargate;
@ -154,24 +150,6 @@ public class Stargate extends JavaPlugin {
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
*

20
src/main/java/net/knarcraft/stargate/config/StargateGateConfig.java
View File

@ -21,6 +21,8 @@ public final class StargateGateConfig {
private boolean destroyExplosion = false;
private ChatColor signColor;
private String defaultGateNetwork = "central";
private static final int activeTime = 10;
private static final int openTime = 10;
/**
* Instantiates a new stargate config
@ -31,6 +33,24 @@ public final class StargateGateConfig {
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
*

4
src/main/java/net/knarcraft/stargate/thread/StarGateThread.java
View File

@ -20,7 +20,7 @@ public class StarGateThread implements Runnable {
if (portal.getOptions().isAlwaysOn() || !portal.isOpen()) {
continue;
}
if (time > portal.getActivatedTime() + Stargate.getOpenTime()) {
if (time > portal.getActivatedTime() + Stargate.getGateConfig().getOpenTime()) {
portal.getPortalOpener().closePortal(false);
iterator.remove();
}
@ -31,7 +31,7 @@ public class StarGateThread implements Runnable {
if (!portal.getPortalActivator().isActive()) {
continue;
}
if (time > portal.getActivatedTime() + Stargate.getActiveTime()) {
if (time > portal.getActivatedTime() + Stargate.getGateConfig().getActiveTime()) {
portal.getPortalActivator().deactivate();
iterator.remove();
}