From b1131c73b9d36793b093ae3068015c6d8970bd51 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Wed, 15 Jul 2020 17:11:05 -0700 Subject: [PATCH] Added decimal support to time-between-players --- src/main/java/us/ajg0702/queue/Main.java | 4 ++-- src/main/java/us/ajg0702/queue/Manager.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java index db84210..b678b4a 100644 --- a/src/main/java/us/ajg0702/queue/Main.java +++ b/src/main/java/us/ajg0702/queue/Main.java @@ -27,7 +27,7 @@ public class Main extends Plugin implements Listener { static Main plugin = null; - public int timeBetweenPlayers = 5; + public double timeBetweenPlayers = 5.0; BungeeStats metrics; @@ -122,7 +122,7 @@ public class Main extends Plugin implements Listener { getProxy().registerChannel("ajqueue:tospigot"); getProxy().registerChannel("ajqueue:tobungee"); - timeBetweenPlayers = config.getInt("wait-time"); + timeBetweenPlayers = config.getDouble("wait-time"); isp = Logic.isp; diff --git a/src/main/java/us/ajg0702/queue/Manager.java b/src/main/java/us/ajg0702/queue/Manager.java index 87c101c..ecb6f95 100644 --- a/src/main/java/us/ajg0702/queue/Manager.java +++ b/src/main/java/us/ajg0702/queue/Manager.java @@ -94,13 +94,13 @@ public class Manager { public void run() { sendPlayers(); } - }, 2, pl.timeBetweenPlayers, TimeUnit.SECONDS).getId(); + }, 2, Math.round(pl.timeBetweenPlayers*1000), TimeUnit.MILLISECONDS).getId(); updateId = pl.getProxy().getScheduler().schedule(pl, new Runnable() { public void run() { updateServers(); } - }, 0, Math.max(pl.timeBetweenPlayers, 2), TimeUnit.SECONDS).getId(); + }, 0, Math.max(Math.round(pl.timeBetweenPlayers), 2), TimeUnit.SECONDS).getId(); //pl.getLogger().info("Time: "+pl.timeBetweenPlayers); messagerId = pl.getProxy().getScheduler().schedule(pl, new Runnable() { @@ -220,7 +220,7 @@ public class Manager { .replaceAll("\\{SERVER\\}", pl.aliases.getAlias(s.getName())) .replaceAll("\\{STATUS\\}", status)+";time="+pl.timeBetweenPlayers); } else { - int time = pos*pl.timeBetweenPlayers; + int time = (int) Math.round(pos*pl.timeBetweenPlayers); int min = (int) Math.floor((time) / (60)); int sec = (int) Math.floor((time % (60))); String timeStr; @@ -339,7 +339,7 @@ public class Manager { .replaceAll("\\{SERVER\\}", pl.aliases.getAlias(s.getName())) )); } else { - int time = pos*pl.timeBetweenPlayers; + int time = (int) Math.round(pos*pl.timeBetweenPlayers); int min = (int) Math.floor((time) / (60)); int sec = (int) Math.floor((time % (60))); String timeStr;