diff --git a/.idea/UltimateSurvivalGames.iml b/.idea/UltimateSurvivalGames.iml index cb9621c..b502093 100644 --- a/.idea/UltimateSurvivalGames.iml +++ b/.idea/UltimateSurvivalGames.iml @@ -11,8 +11,8 @@ - - + + \ No newline at end of file diff --git a/UltimateSurvivalGames/src/me/maker56/survivalgames/arena/ArenaManager.java b/UltimateSurvivalGames/src/me/maker56/survivalgames/arena/ArenaManager.java index 0196016..6f5cc5e 100644 --- a/UltimateSurvivalGames/src/me/maker56/survivalgames/arena/ArenaManager.java +++ b/UltimateSurvivalGames/src/me/maker56/survivalgames/arena/ArenaManager.java @@ -15,11 +15,7 @@ import me.maker56.survivalgames.listener.DomeListener; import me.maker56.survivalgames.reset.Save; import me.maker56.survivalgames.reset.Selection; -import net.md_5.bungee.api.ChatColor; -import org.bukkit.Bukkit; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.Material; +import org.bukkit.*; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; diff --git a/UltimateSurvivalGames/src/me/maker56/survivalgames/game/Game.java b/UltimateSurvivalGames/src/me/maker56/survivalgames/game/Game.java index 7e029ca..f591cab 100644 --- a/UltimateSurvivalGames/src/me/maker56/survivalgames/game/Game.java +++ b/UltimateSurvivalGames/src/me/maker56/survivalgames/game/Game.java @@ -21,11 +21,9 @@ import me.maker56.survivalgames.user.SpectatorUser; import me.maker56.survivalgames.user.User; import me.maker56.survivalgames.user.UserState; -import net.md_5.bungee.api.chat.BaseComponent; -import net.md_5.bungee.api.ChatColor; - import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -529,10 +527,10 @@ public void sendMessage(String message) { public void sendMessage(TextComponent message) { for(User user : users) { - user.sendMessage(message); + user.sendMessage(message.getText()); } for(SpectatorUser su : spectators) { - su.sendMessage(message); + su.sendMessage(message.getText()); } } diff --git a/UltimateSurvivalGames/src/me/maker56/survivalgames/game/GameManager.java b/UltimateSurvivalGames/src/me/maker56/survivalgames/game/GameManager.java index cfe12b4..9c8e36e 100644 --- a/UltimateSurvivalGames/src/me/maker56/survivalgames/game/GameManager.java +++ b/UltimateSurvivalGames/src/me/maker56/survivalgames/game/GameManager.java @@ -8,7 +8,7 @@ import me.maker56.survivalgames.game.phases.DeathmatchPhase; import me.maker56.survivalgames.game.phases.IngamePhase; import me.maker56.survivalgames.game.phases.VotingPhase; -import net.md_5.bungee.api.ChatColor; +import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; diff --git a/UltimateSurvivalGames/src/me/maker56/survivalgames/listener/ChatListener.java b/UltimateSurvivalGames/src/me/maker56/survivalgames/listener/ChatListener.java index 9f6afbb..4ec2fa0 100644 --- a/UltimateSurvivalGames/src/me/maker56/survivalgames/listener/ChatListener.java +++ b/UltimateSurvivalGames/src/me/maker56/survivalgames/listener/ChatListener.java @@ -65,9 +65,9 @@ public void onPlayerChat(AsyncPlayerChatEvent event) { Game g = u.getGame(); if(u.isSpectator()) { - g.sendSpectators(bc); + g.sendSpectators(bc.getText()); } else { - g.sendMessage(bc); + g.sendMessage(bc.getText()); } } else { event.getRecipients().removeIf(p -> um.isPlaying(p.getName()) || um.isSpectator(p.getName())); diff --git a/UltimateSurvivalGames/src/plugin.yml b/UltimateSurvivalGames/src/plugin.yml index 0e63094..b01f3f0 100644 --- a/UltimateSurvivalGames/src/plugin.yml +++ b/UltimateSurvivalGames/src/plugin.yml @@ -1,7 +1,7 @@ name: SurvivalGames authors: [maker56,JefroyTJF,Jerzean] main: me.maker56.survivalgames.SurvivalGames -version: 1.18.01 +version: 1.18.0001 website: http://dev.bukkit.org/bukkit-plugins/survival_games softdepend: [WorldEdit,Vault,Multiverse-Core,BarAPI,PermissionsEx] api-version: 1.17