summaryrefslogtreewikicommitdiff
path: root/src/main/java/net/tylermurphy/hideAndSeek/game
diff options
context:
space:
mode:
authorTyler Murphy <tylermurphy534@gmail.com>2022-11-21 23:47:04 -0500
committerTyler Murphy <tylermurphy534@gmail.com>2022-11-21 23:47:04 -0500
commitfcc3764a14d76fa24cddb75fe338a3ee36dec3fa (patch)
tree7db605d10cceffe29f1f9dca884e99f35d24d6e4 /src/main/java/net/tylermurphy/hideAndSeek/game
parent1.7.0 beta 8 (diff)
downloadkenshinshideandseek-fcc3764a14d76fa24cddb75fe338a3ee36dec3fa.tar.gz
kenshinshideandseek-fcc3764a14d76fa24cddb75fe338a3ee36dec3fa.tar.bz2
kenshinshideandseek-fcc3764a14d76fa24cddb75fe338a3ee36dec3fa.zip
1.7.0 beta 9
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/game')
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/game/Board.java2
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/game/Game.java6
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java1
3 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
index 83fc2a6..1873fd4 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
@@ -268,7 +268,7 @@ public class Board {
board.setLine(String.valueOf(i), line.replace("{TEAM}", value));
} else if (line.contains("{BORDER}")) {
if (!Main.getInstance().getGame().getCurrentMap().isWorldBorderEnabled()) continue;
- if (worldBorder == null || status == Status.STARTING) {
+ if (status == Status.STARTING) {
board.setLine(String.valueOf(i), line.replace("{BORDER}", BORDER_COUNTING.replace("{AMOUNT}", "0")));
} else if (!worldBorder.isRunning()) {
board.setLine(String.valueOf(i), line.replace("{BORDER}", BORDER_COUNTING.replaceFirst("\\{AMOUNT}", worldBorder.getDelay()/60+"").replaceFirst("\\{AMOUNT}", worldBorder.getDelay()%60+"")));
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index e238caf..e18a309 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -97,13 +97,15 @@ public class Game {
}
public void start() {
+ Player seeker;
try {
int rand = (int) (Math.random() * board.getPlayers().size());
- Player seeker = board.getPlayers().get(rand);
- start(seeker);
+ seeker = board.getPlayers().get(rand);
} catch (Exception e){
Main.getInstance().getLogger().warning("Failed to select random seeker.");
+ return;
}
+ start(seeker);
}
public void start(Player seeker) {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
index 1e7ba69..d34cb11 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/PlayerHandler.java
@@ -2,7 +2,6 @@ package net.tylermurphy.hideAndSeek.game.listener;
import net.tylermurphy.hideAndSeek.Main;
import net.tylermurphy.hideAndSeek.configuration.Items;
-import net.tylermurphy.hideAndSeek.game.Game;
import net.tylermurphy.hideAndSeek.game.util.Status;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;