diff --git a/src/main/kotlin/xyz/fortern/minehunt/Console.kt b/src/main/kotlin/xyz/fortern/minehunt/Console.kt index 77ea69a..180e7a3 100644 --- a/src/main/kotlin/xyz/fortern/minehunt/Console.kt +++ b/src/main/kotlin/xyz/fortern/minehunt/Console.kt @@ -68,9 +68,9 @@ class Console { val hunterTeam: Team /** - * 观察者队伍 + * 观众队伍 */ - val spectatorTeam: Team + val audienceTeam: Team // 玩家退出游戏后会自动离开Team,所以我们维护自己的玩家集合 @@ -85,9 +85,9 @@ class Console { private val hunterSet: MutableSet = HashSet() /** - * 旁观者玩家集合 + * 观众玩家集合 */ - private val spectatorSet: MutableSet = HashSet() + private val audienceSet: MutableSet = HashSet() /** * 淘汰玩家集合 @@ -200,7 +200,7 @@ class Console { speedrunnerTeam = scoreboard.getTeam("speedrunner") ?: scoreboard.registerNewTeam("speedrunner") hunterTeam = scoreboard.getTeam("hunter") ?: scoreboard.registerNewTeam("hunter") - spectatorTeam = scoreboard.getTeam("spectator") ?: scoreboard.registerNewTeam("spectator") + audienceTeam = scoreboard.getTeam("spectator") ?: scoreboard.registerNewTeam("spectator") speedrunnerTeam.let { t -> t.color(NamedTextColor.BLUE) @@ -212,10 +212,10 @@ class Console { t.prefix(Component.text("[猎人] ", NamedTextColor.RED)) t.entries.forEach { hunterTeam.removeEntries(it) } } - spectatorTeam.let { t -> + audienceTeam.let { t -> t.color(NamedTextColor.GRAY) t.prefix(Component.text("[观众] ", NamedTextColor.GRAY)) - t.entries.forEach { spectatorTeam.removeEntries(it) } + t.entries.forEach { audienceTeam.removeEntries(it) } } } @@ -225,9 +225,9 @@ class Console { fun isHunter(player: Player): Boolean = hunterTeam.hasPlayer(player) /** - * 判断是否为观察者 + * 判断是否为观众 */ - fun isSpectator(player: Player): Boolean = spectatorTeam.hasPlayer(player) + fun isSpectator(player: Player): Boolean = audienceTeam.hasPlayer(player) /** * 判断是否为速通者 @@ -255,11 +255,11 @@ class Console { } /** - * 加入观察者阵营 + * 加入观众阵营 */ - fun joinSpectator(player: Player) { + fun joinAudience(player: Player) { if (stage == GameStage.PREPARING && beginningCountdown == null) { - spectatorTeam.addPlayer(player) + audienceTeam.addPlayer(player) player.sendMessage(Component.text("你已加入[观众]")) } } diff --git a/src/main/kotlin/xyz/fortern/minehunt/command/MinehuntCommand.kt b/src/main/kotlin/xyz/fortern/minehunt/command/MinehuntCommand.kt index 598433d..14d3348 100644 --- a/src/main/kotlin/xyz/fortern/minehunt/command/MinehuntCommand.kt +++ b/src/main/kotlin/xyz/fortern/minehunt/command/MinehuntCommand.kt @@ -18,7 +18,7 @@ class MinehuntCommand( ) : TabExecutor { private val subCommands: List = listOf("help", "join", "leave", "rule", "start", "stop", "give") - private val teams: List = listOf("hunter", "speedrunner", "spectator") + private val teams: List = listOf("hunter", "speedrunner", "audience") private val rules: List = listOf("hunter_respawn_cd", "hunter_ready_cd", "friendly_fire") private val items: List = listOf("compass") @@ -26,7 +26,7 @@ class MinehuntCommand( Component.text("Minehunt v${Minehunt.instance().pluginMeta.version}", NamedTextColor.GREEN), Component.text("/minehunt help ", NamedTextColor.GOLD) .append(Component.text("帮助信息", NamedTextColor.WHITE)), - Component.text("/minehunt join (hunter|speedrunner|spectator) ", NamedTextColor.GOLD) + Component.text("/minehunt join (hunter|speedrunner|audience) ", NamedTextColor.GOLD) .append(Component.text("加入一个阵营", NamedTextColor.WHITE)), Component.text("/minehunt leave ", NamedTextColor.GOLD) .append(Component.text("加入观察者阵营", NamedTextColor.WHITE)), @@ -166,8 +166,8 @@ class MinehuntCommand( console.joinSpeedrunner(sender) } - "spectator" -> { - console.joinSpectator(sender) + "audience" -> { + console.joinAudience(sender) } else -> { @@ -192,7 +192,7 @@ class MinehuntCommand( if (sender !is Player) { sender.sendMessage(Component.text("The sender is not a player.", NamedTextColor.RED)) } else { - console.joinSpectator(sender) + console.joinAudience(sender) } } return null diff --git a/src/main/kotlin/xyz/fortern/minehunt/listener/PlayerListener.kt b/src/main/kotlin/xyz/fortern/minehunt/listener/PlayerListener.kt index 8ad52cd..2226004 100644 --- a/src/main/kotlin/xyz/fortern/minehunt/listener/PlayerListener.kt +++ b/src/main/kotlin/xyz/fortern/minehunt/listener/PlayerListener.kt @@ -30,7 +30,7 @@ class PlayerListener( // 在准备阶段,玩家设为冒险模式 player.gameMode = GameMode.ADVENTURE // 自动加入观察者队伍 - console.spectatorTeam.addPlayer(player) + console.audienceTeam.addPlayer(player) } }