diff options
author | Luck <git@lucko.me> | 2018-12-19 14:07:01 +0000 |
---|---|---|
committer | Luck <git@lucko.me> | 2018-12-19 14:07:01 +0000 |
commit | 66a8afab99efb7ac7669961eb2e67e2244d494e5 (patch) | |
tree | 7930ab1768da5df81799995472292d73d6ce2647 /spark-sponge/src | |
parent | db6ac9b36ae0242c53dc1452ac8fbc6cd7b748c2 (diff) | |
download | spark-66a8afab99efb7ac7669961eb2e67e2244d494e5.tar.gz spark-66a8afab99efb7ac7669961eb2e67e2244d494e5.tar.bz2 spark-66a8afab99efb7ac7669961eb2e67e2244d494e5.zip |
Count current tick using an int instead of LongAdder
Assuming 20tps, there's enough space in an int to store a tick count spanning a number of years :)
Diffstat (limited to 'spark-sponge/src')
-rw-r--r-- | spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java | 6 | ||||
-rw-r--r-- | spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java index aa42efd..01052cb 100644 --- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java +++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java @@ -116,7 +116,7 @@ public class SparkSpongePlugin implements CommandCallable { @Override public void runAsync(Runnable r) { - asyncExecutor.execute(r); + SparkSpongePlugin.this.asyncExecutor.execute(r); } @Override @@ -139,7 +139,7 @@ public class SparkSpongePlugin implements CommandCallable { @Listener public void onServerStart(GameStartedServerEvent event) { - game.getCommandManager().register(this, this, "spark"); + this.game.getCommandManager().register(this, this, "spark"); } @Override @@ -149,7 +149,7 @@ public class SparkSpongePlugin implements CommandCallable { return CommandResult.empty(); } - sparkPlatform.executeCommand(source, arguments.split(" ")); + this.sparkPlatform.executeCommand(source, arguments.split(" ")); return CommandResult.empty(); } diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java index a3eba45..14b30b8 100644 --- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java +++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SpongeTickCounter.java @@ -26,14 +26,13 @@ import org.spongepowered.api.scheduler.Task; import java.util.HashSet; import java.util.Set; -import java.util.concurrent.atomic.LongAdder; public class SpongeTickCounter implements TickCounter, Runnable { private final SparkSpongePlugin plugin; private Task task; private final Set<Runnable> tasks = new HashSet<>(); - private final LongAdder tick = new LongAdder(); + private int tick = 0; public SpongeTickCounter(SparkSpongePlugin plugin) { this.plugin = plugin; @@ -44,7 +43,7 @@ public class SpongeTickCounter implements TickCounter, Runnable { for (Runnable r : this.tasks){ r.run(); } - this.tick.increment(); + this.tick++; } @Override @@ -58,8 +57,8 @@ public class SpongeTickCounter implements TickCounter, Runnable { } @Override - public long getCurrentTick() { - return this.tick.longValue(); + public int getCurrentTick() { + return this.tick; } @Override |