summaryrefslogtreewikicommitdiff
path: root/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
diff options
context:
space:
mode:
authorTyler Murphy <tylermurphy534@gmail.com>2022-05-10 13:24:19 -0400
committerTyler Murphy <tylermurphy534@gmail.com>2022-05-10 13:24:19 -0400
commit487ce5e3f56c5bff5d0538e4cd8d23ddfb73cc02 (patch)
tree1217a10a364c3e56792f5d3863383230b24d3eb2 /src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
parentrank-place placeholder, fix null pointer in sql (diff)
downloadkenshinshideandseek-487ce5e3f56c5bff5d0538e4cd8d23ddfb73cc02.tar.gz
kenshinshideandseek-487ce5e3f56c5bff5d0538e4cd8d23ddfb73cc02.tar.bz2
kenshinshideandseek-487ce5e3f56c5bff5d0538e4cd8d23ddfb73cc02.zip
fix seeker death and other things
Diffstat (limited to '')
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/game/Game.java18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index fb91a2f..76ad068 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -186,6 +186,11 @@ public class Game {
}
worldBorder.resetWorldborder(getGameWorld());
for(Player player : Board.getPlayers()) {
+ for(Player player2 : Board.getPlayers()){
+ player.showPlayer(player2);
+ }
+ player.setFlying(false);
+ player.setAllowFlight(false);
if(Version.atLeast("1.9")){
for(Player temp : Board.getPlayers()) {
Packet.setGlow(player, temp, false);
@@ -299,7 +304,12 @@ public class Game {
} else {
Board.addSpectator(player);
player.sendMessage(messagePrefix + message("GAME_JOIN_SPECTATOR"));
- player.setGameMode(GameMode.SPECTATOR);
+ player.setGameMode(GameMode.ADVENTURE);
+ for(Player player2 : Board.getPlayers()){
+ player2.hidePlayer(player);
+ }
+ player.setFlying(true);
+ player.setAllowFlight(true);
Board.createGameBoard(player);
player.teleport(new Location(Bukkit.getWorld(getGameWorld()), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
Titles.sendTitle(player, 10, 70, 20, ChatColor.GRAY + "" + ChatColor.BOLD + "SPECTATING", ChatColor.WHITE + message("SPECTATOR_SUBTITLE").toString());
@@ -315,6 +325,12 @@ public class Game {
}
public static void leave(Player player){
+ player.setFlying(false);
+ player.setAllowFlight(false);
+ for(Player player2 : Board.getPlayers()){
+ player2.showPlayer(player);
+ player.showPlayer(player2);
+ }
if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player));
else Game.broadcastMessage(messagePrefix + message("GAME_LEAVE").addPlayer(player));
Board.removeBoard(player);