Upstream/Harbor-Minecraft
1
0
Fork 0
mirror of https://github.com/nkomarn/harbor.git synced 2024-09-29 06:57:35 +02:00
Code Issues Projects Releases Wiki Activity

🌠 Use a HashSet instead of ArrayList

Browse Source 
Harbor runs .contains() a lot, which is a lot more performant in Sets.
This commit is contained in:
Mykyta 2020-04-24 15:45:42 -07:00
parent b5eaeeb7f1
commit 7b4c55e9a3
No known key found for this signature in database
GPG Key ID: C147E30C19EA3570
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/xyz/nkomarn/Harbor/command/HarborCommand.java
View File

@ -37,11 +37,11 @@ public class HarborCommand implements TabExecutor {
Player player = (Player) sender;
World world = player.getWorld();
if (Checker.skippingWorlds.contains(world)) {
if (Checker.SKIPPING_WORLDS.contains(world)) {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', prefix
+ "This world's time is already being accelerated."));
} else {
Checker.skippingWorlds.add(world);
Checker.SKIPPING_WORLDS.add(world);
new AccelerateNightTask(world).runTaskTimer(Harbor.getHarbor(), 0L, 1);
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', prefix
+ "Forcing night skip in your world."));

4
src/main/java/xyz/nkomarn/Harbor/listener/BedListener.java
View File

@ -21,7 +21,7 @@ public class BedListener implements Listener {
@EventHandler(ignoreCancelled = true)
public void onBedEnter(final PlayerBedEnterEvent event) {
if (event.getBedEnterResult() != PlayerBedEnterEvent.BedEnterResult.OK) return;
if (Checker.skippingWorlds.contains(event.getPlayer().getWorld())) return;
if (Checker.SKIPPING_WORLDS.contains(event.getPlayer().getWorld())) return;
if (Checker.isVanished(event.getPlayer())) return;
Bukkit.getScheduler().runTaskLater(Harbor.getHarbor(), () -> {
@ -39,7 +39,7 @@ public class BedListener implements Listener {
@EventHandler(ignoreCancelled = true)
public void onBedLeave(final PlayerBedLeaveEvent event) {
if (Checker.skippingWorlds.contains(event.getPlayer().getWorld())) return;
if (Checker.SKIPPING_WORLDS.contains(event.getPlayer().getWorld())) return;
if (Checker.isVanished(event.getPlayer())) return;
Bukkit.getScheduler().runTaskLater(Harbor.getHarbor(), () -> {

2
src/main/java/xyz/nkomarn/Harbor/task/AccelerateNightTask.java
View File

@ -43,7 +43,7 @@ public class AccelerateNightTask extends BukkitRunnable {
world.getPlayers().forEach(player -> player.setStatistic(Statistic.TIME_SINCE_REST, 0));
}
Checker.skippingWorlds.remove(world);
Checker.SKIPPING_WORLDS.remove(world);
Messages.sendRandomChatMessage(world, "messages.chat.night-skipped");
this.cancel();
} else {

10
src/main/java/xyz/nkomarn/Harbor/task/Checker.java
View File

@ -3,7 +3,6 @@ package xyz.nkomarn.Harbor.task;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.World;
import org.bukkit.boss.BarColor;
import org.bukkit.entity.Player;
import org.bukkit.metadata.MetadataValue;
@ -12,13 +11,14 @@ import xyz.nkomarn.Harbor.util.Afk;
import xyz.nkomarn.Harbor.util.Config;
import xyz.nkomarn.Harbor.util.Messages;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import static java.util.stream.Collectors.toList;
public class Checker implements Runnable {
public static final List<World> skippingWorlds = new ArrayList<>();
public static final Set<World> SKIPPING_WORLDS = new HashSet<>();
@Override
public void run() {
@ -48,7 +48,7 @@ public class Checker implements Runnable {
world.setTime(Config.getInteger("night-skip.daytime-ticks")));
Messages.sendRandomChatMessage(world, "messages.chat.night-skipped");
} else {
skippingWorlds.add(world);
SKIPPING_WORLDS.add(world);
new AccelerateNightTask(world).runTaskTimer(Harbor.getHarbor(), 1, 1);
}
}
@ -56,7 +56,7 @@ public class Checker implements Runnable {
private boolean validateWorld(final World world) {
return !isBlacklisted(world)
&& !skippingWorlds.contains(world)
&& !SKIPPING_WORLDS.contains(world)
&& isNight(world);
}