ineanto/runnerdragon
1
0
Fork 0
Code Activity

feat: some fixes here and there

Browse source
This commit is contained in:
aro 2023-02-21 12:24:45 +01:00
parent 045f18bc52
commit 2a14483bf3
5 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/xyz/atnrch/dragon/commands/TeamsSubCommand.kt
View file

@ -11,7 +11,7 @@ class TeamsSubCommand {
if (args.isEmpty()) {
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}Nombre: ${ChatColor.AQUA}${RunnerDragon.NUMBER_OF_TEAMS}
${ChatColor.DARK_GRAY}- ${ChatColor.GOLD}Capacité: ${ChatColor.AQUA}${RunnerDragon.TEAM_MAX_SIZE}

27
src/main/kotlin/xyz/atnrch/dragon/event/PlayerJoinListener.kt
View file

@ -1,23 +1,40 @@
package xyz.atnrch.dragon.event
import org.bukkit.ChatColor
import org.bukkit.GameMode
import org.bukkit.event.EventHandler
import org.bukkit.event.Listener
import org.bukkit.event.player.PlayerJoinEvent
import xyz.atnrch.dragon.GameState
import xyz.atnrch.dragon.RunnerDragon
import xyz.atnrch.dragon.player.DragonPlayer
import xyz.haoshoku.nick.api.NickAPI
class PlayerJoinListener : Listener {
@EventHandler
fun onPlayerJoin(event: PlayerJoinEvent) {
val player = event.player
val dragonPlayer: DragonPlayer = RunnerDragon.instance.playerManager.addPlayer(player.uniqueId)
val dragonPlayer = RunnerDragon.instance.playerManager.addPlayer(player.uniqueId)
NickAPI.resetNick(player)
NickAPI.resetUniqueId(player)
NickAPI.resetGameProfileName(player)
NickAPI.resetSkin(player)
NickAPI.setUniqueId(player, player.uniqueId)
event.joinMessage = "(${ChatColor.GREEN}+${ChatColor.WHITE}) ${player.name}"
if (RunnerDragon.STATE == GameState.WAITING) {
dragonPlayer.sendMessage("Bienvenue !")
dragonPlayer.instantiatePlayer()
RunnerDragon.instance.playerManager.getPlayers().forEach { (_, player) ->
player.updateDisplayName()
player.setTeamItem(true)
dragonPlayer.setTeamItem(true)
}
event.joinMessage = "(${ChatColor.GREEN}+${ChatColor.WHITE}) ${player.name}"
if (dragonPlayer.getTeam() == null) {
dragonPlayer.player.gameMode = GameMode.SPECTATOR
dragonPlayer.sendMessage("Partie rejointe en spectateur.")
return
}
dragonPlayer.updateDisplayName()
}
}

4
src/main/kotlin/xyz/atnrch/dragon/event/PlayerQuitListener.kt
View file

@ -4,15 +4,11 @@ import org.bukkit.ChatColor
import org.bukkit.event.EventHandler
import org.bukkit.event.Listener
import org.bukkit.event.player.PlayerQuitEvent
import xyz.atnrch.dragon.RunnerDragon
class PlayerQuitListener : Listener {
@EventHandler
fun onPlayerJoin(event: PlayerQuitEvent) {
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}"
}
}

5
src/main/kotlin/xyz/atnrch/dragon/player/DragonPlayer.kt
View file

@ -5,7 +5,6 @@ import org.bukkit.ChatColor
import org.bukkit.GameMode
import org.bukkit.Material
import org.bukkit.inventory.ItemStack
import xyz.atnrch.dragon.GameState
import xyz.atnrch.dragon.RunnerDragon
import xyz.atnrch.dragon.teams.Team
import xyz.haoshoku.nick.api.NickAPI
@ -16,13 +15,11 @@ class DragonPlayer(uuid: UUID) {
val player = Bukkit.getPlayer(uuid)!!
fun instantiatePlayer() {
if (RunnerDragon.STATE == GameState.WAITING) {
RunnerDragon.instance.worldManager.teleportAtSpawn(player)
RunnerDragon.instance.worldManager.teleportAtSpawn(player) // really useful?
updateHeaderFooter()
impulse101()
setTeam(Team.DEFAULT_TEAM)
}
}
fun updateHeaderFooter() {
player.playerListHeader = """

1
src/main/kotlin/xyz/atnrch/dragon/tasks/GracePeriodTask.kt
View file

@ -11,7 +11,6 @@ class GracePeriodTask : BukkitRunnable() {
override fun run() {
counter--
Bukkit.broadcastMessage(counter.toString())
val base = "${ChatColor.GOLD}Activation du PVP dans"
when (counter) {
600 -> Bukkit.broadcastMessage("${RunnerDragon.TITLE_MSG} $base ${ChatColor.AQUA}10 ${ChatColor.GOLD}minutes.")