feat: some fixes here and there
This commit is contained in:
parent
045f18bc52
commit
2a14483bf3
5 changed files with 29 additions and 20 deletions
|
@ -11,7 +11,7 @@ class TeamsSubCommand {
|
||||||
if (args.isEmpty()) {
|
if (args.isEmpty()) {
|
||||||
player.sendMessage(
|
player.sendMessage(
|
||||||
"""
|
"""
|
||||||
${ChatColor.LIGHT_PURPLE}Configuration des équipes:
|
Configuration des équipes:
|
||||||
${ChatColor.DARK_GRAY}- ${ChatColor.GOLD}Status: ${if (RunnerDragon.TEAM_LOCK) "${ChatColor.RED}fermées" else "${ChatColor.GREEN}ouvertes${ChatColor.RESET}."}
|
${ChatColor.DARK_GRAY}- ${ChatColor.GOLD}Status: ${if (RunnerDragon.TEAM_LOCK) "${ChatColor.RED}fermées" else "${ChatColor.GREEN}ouvertes${ChatColor.RESET}."}
|
||||||
${ChatColor.DARK_GRAY}- ${ChatColor.GOLD}Nombre: ${ChatColor.AQUA}${RunnerDragon.NUMBER_OF_TEAMS}
|
${ChatColor.DARK_GRAY}- ${ChatColor.GOLD}Nombre: ${ChatColor.AQUA}${RunnerDragon.NUMBER_OF_TEAMS}
|
||||||
${ChatColor.DARK_GRAY}- ${ChatColor.GOLD}Capacité: ${ChatColor.AQUA}${RunnerDragon.TEAM_MAX_SIZE}
|
${ChatColor.DARK_GRAY}- ${ChatColor.GOLD}Capacité: ${ChatColor.AQUA}${RunnerDragon.TEAM_MAX_SIZE}
|
||||||
|
|
|
@ -1,23 +1,40 @@
|
||||||
package xyz.atnrch.dragon.event
|
package xyz.atnrch.dragon.event
|
||||||
|
|
||||||
import org.bukkit.ChatColor
|
import org.bukkit.ChatColor
|
||||||
|
import org.bukkit.GameMode
|
||||||
import org.bukkit.event.EventHandler
|
import org.bukkit.event.EventHandler
|
||||||
import org.bukkit.event.Listener
|
import org.bukkit.event.Listener
|
||||||
import org.bukkit.event.player.PlayerJoinEvent
|
import org.bukkit.event.player.PlayerJoinEvent
|
||||||
|
import xyz.atnrch.dragon.GameState
|
||||||
import xyz.atnrch.dragon.RunnerDragon
|
import xyz.atnrch.dragon.RunnerDragon
|
||||||
|
import xyz.atnrch.dragon.player.DragonPlayer
|
||||||
|
import xyz.haoshoku.nick.api.NickAPI
|
||||||
|
|
||||||
class PlayerJoinListener : Listener {
|
class PlayerJoinListener : Listener {
|
||||||
@EventHandler
|
@EventHandler
|
||||||
fun onPlayerJoin(event: PlayerJoinEvent) {
|
fun onPlayerJoin(event: PlayerJoinEvent) {
|
||||||
val player = event.player
|
val player = event.player
|
||||||
|
val dragonPlayer: DragonPlayer = RunnerDragon.instance.playerManager.addPlayer(player.uniqueId)
|
||||||
|
|
||||||
|
NickAPI.resetNick(player)
|
||||||
|
NickAPI.resetUniqueId(player)
|
||||||
|
NickAPI.resetGameProfileName(player)
|
||||||
|
NickAPI.resetSkin(player)
|
||||||
|
NickAPI.setUniqueId(player, player.uniqueId)
|
||||||
|
|
||||||
val dragonPlayer = RunnerDragon.instance.playerManager.addPlayer(player.uniqueId)
|
|
||||||
dragonPlayer.sendMessage("Bienvenue !")
|
|
||||||
dragonPlayer.instantiatePlayer()
|
|
||||||
RunnerDragon.instance.playerManager.getPlayers().forEach { (_, player) ->
|
|
||||||
player.updateDisplayName()
|
|
||||||
player.setTeamItem(true)
|
|
||||||
}
|
|
||||||
event.joinMessage = "(${ChatColor.GREEN}+${ChatColor.WHITE}) ${player.name}"
|
event.joinMessage = "(${ChatColor.GREEN}+${ChatColor.WHITE}) ${player.name}"
|
||||||
|
if (RunnerDragon.STATE == GameState.WAITING) {
|
||||||
|
dragonPlayer.sendMessage("Bienvenue !")
|
||||||
|
dragonPlayer.instantiatePlayer()
|
||||||
|
dragonPlayer.setTeamItem(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dragonPlayer.getTeam() == null) {
|
||||||
|
dragonPlayer.player.gameMode = GameMode.SPECTATOR
|
||||||
|
dragonPlayer.sendMessage("Partie rejointe en spectateur.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
dragonPlayer.updateDisplayName()
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -4,15 +4,11 @@ import org.bukkit.ChatColor
|
||||||
import org.bukkit.event.EventHandler
|
import org.bukkit.event.EventHandler
|
||||||
import org.bukkit.event.Listener
|
import org.bukkit.event.Listener
|
||||||
import org.bukkit.event.player.PlayerQuitEvent
|
import org.bukkit.event.player.PlayerQuitEvent
|
||||||
import xyz.atnrch.dragon.RunnerDragon
|
|
||||||
|
|
||||||
class PlayerQuitListener : Listener {
|
class PlayerQuitListener : Listener {
|
||||||
@EventHandler
|
@EventHandler
|
||||||
fun onPlayerJoin(event: PlayerQuitEvent) {
|
fun onPlayerJoin(event: PlayerQuitEvent) {
|
||||||
val player = event.player
|
val player = event.player
|
||||||
|
|
||||||
RunnerDragon.instance.teamManager.getPlayerTeam(player)!!.removePlayer(player.uniqueId)
|
|
||||||
RunnerDragon.instance.playerManager.removePlayer(player.uniqueId)
|
|
||||||
event.quitMessage = "(${ChatColor.RED}-${ChatColor.WHITE}) ${player.name}"
|
event.quitMessage = "(${ChatColor.RED}-${ChatColor.WHITE}) ${player.name}"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -5,7 +5,6 @@ import org.bukkit.ChatColor
|
||||||
import org.bukkit.GameMode
|
import org.bukkit.GameMode
|
||||||
import org.bukkit.Material
|
import org.bukkit.Material
|
||||||
import org.bukkit.inventory.ItemStack
|
import org.bukkit.inventory.ItemStack
|
||||||
import xyz.atnrch.dragon.GameState
|
|
||||||
import xyz.atnrch.dragon.RunnerDragon
|
import xyz.atnrch.dragon.RunnerDragon
|
||||||
import xyz.atnrch.dragon.teams.Team
|
import xyz.atnrch.dragon.teams.Team
|
||||||
import xyz.haoshoku.nick.api.NickAPI
|
import xyz.haoshoku.nick.api.NickAPI
|
||||||
|
@ -16,12 +15,10 @@ class DragonPlayer(uuid: UUID) {
|
||||||
val player = Bukkit.getPlayer(uuid)!!
|
val player = Bukkit.getPlayer(uuid)!!
|
||||||
|
|
||||||
fun instantiatePlayer() {
|
fun instantiatePlayer() {
|
||||||
if (RunnerDragon.STATE == GameState.WAITING) {
|
RunnerDragon.instance.worldManager.teleportAtSpawn(player) // really useful?
|
||||||
RunnerDragon.instance.worldManager.teleportAtSpawn(player)
|
updateHeaderFooter()
|
||||||
updateHeaderFooter()
|
impulse101()
|
||||||
impulse101()
|
setTeam(Team.DEFAULT_TEAM)
|
||||||
setTeam(Team.DEFAULT_TEAM)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun updateHeaderFooter() {
|
fun updateHeaderFooter() {
|
||||||
|
|
|
@ -11,7 +11,6 @@ class GracePeriodTask : BukkitRunnable() {
|
||||||
|
|
||||||
override fun run() {
|
override fun run() {
|
||||||
counter--
|
counter--
|
||||||
Bukkit.broadcastMessage(counter.toString())
|
|
||||||
val base = "${ChatColor.GOLD}Activation du PVP dans"
|
val base = "${ChatColor.GOLD}Activation du PVP dans"
|
||||||
when (counter) {
|
when (counter) {
|
||||||
600 -> Bukkit.broadcastMessage("${RunnerDragon.TITLE_MSG} $base ${ChatColor.AQUA}10 ${ChatColor.GOLD}minutes.")
|
600 -> Bukkit.broadcastMessage("${RunnerDragon.TITLE_MSG} $base ${ChatColor.AQUA}10 ${ChatColor.GOLD}minutes.")
|
||||||
|
|
Loading…
Reference in a new issue