Skip to content

Add PlayerJoinGameEvent, use it instead of PlayerSpawnEvent in some c… #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ex4dev merged 3 commits into from
Jul 12, 2025
Merged

Add PlayerJoinGameEvent, use it instead of PlayerSpawnEvent in some c… #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4342a6
Add PlayerJoinGameEvent, use it instead of PlayerSpawnEvent in some c…
ex4dev Jul 5, 2025
b6b4fc3
Fix PlayerLeaveGameEvent and make Game.players externally immutable
ex4dev Jul 11, 2025
aec1cac
Make team.players externally immutable
ex4dev Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions common/src/main/kotlin/com/bluedragonmc/server/Game.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ import com.bluedragonmc.api.grpc.CommonTypes.GameType.GameTypeFieldSelector
import com.bluedragonmc.api.grpc.gameState
import com.bluedragonmc.api.grpc.gameType
import com.bluedragonmc.server.api.Environment
import com.bluedragonmc.server.event.GameEvent
import com.bluedragonmc.server.event.GameStartEvent
import com.bluedragonmc.server.event.GameStateChangedEvent
import com.bluedragonmc.server.event.PlayerLeaveGameEvent
import com.bluedragonmc.server.event.*
import com.bluedragonmc.server.model.GameDocument
import com.bluedragonmc.server.model.InstanceRecord
import com.bluedragonmc.server.model.PlayerRecord
Expand All @@ -35,8 +32,7 @@ import net.minestom.server.event.Event
import net.minestom.server.event.EventFilter
import net.minestom.server.event.EventListener
import net.minestom.server.event.EventNode
import net.minestom.server.event.instance.RemoveEntityFromInstanceEvent
import net.minestom.server.event.player.PlayerSpawnEvent
import net.minestom.server.event.player.PlayerDisconnectEvent
import net.minestom.server.event.server.ServerTickMonitorEvent
import net.minestom.server.event.trait.InstanceEvent
import net.minestom.server.event.trait.PlayerEvent
Expand Down Expand Up @@ -75,7 +71,8 @@ abstract class Game(val name: String, val mapName: String, val mode: String? = n
maxSlots = maxPlayers
}

internal val players: MutableList<Player> = CopyOnWriteArrayList()
private val _players: MutableList<Player> = CopyOnWriteArrayList()
val players: List<Player> = _players

protected val logger: Logger = LoggerFactory.getLogger(this::class.java)

Expand Down Expand Up @@ -103,7 +100,7 @@ abstract class Game(val name: String, val mapName: String, val mode: String? = n
return@event when (event) {
is InstanceEvent -> ownsInstance(event.instance ?: return@event false)
is GameEvent -> event.game === this
is PlayerEvent -> event.player.isActive && ownsInstance(event.player.instance ?: return@event false)
is PlayerEvent -> players.contains(event.player)
is ServerTickMonitorEvent -> true
else -> false
}
Expand All @@ -128,14 +125,11 @@ abstract class Game(val name: String, val mapName: String, val mode: String? = n

protected open fun useMandatoryModules() {
Messaging.outgoing.onGameCreated(this)
handleEvent<PlayerSpawnEvent> {
handleEvent<PlayerJoinGameEvent> {
playerHasJoined = true
}
handleEvent<RemoveEntityFromInstanceEvent> { event ->
if (event.entity !is Player) return@handleEvent
callCancellable(PlayerLeaveGameEvent(this, event.entity as Player)) {
players.remove(event.entity)
}
handleEvent<PlayerDisconnectEvent> { event ->
removePlayer(event.player)
}
onGameStart {
startTime = Date()
Expand Down Expand Up @@ -191,12 +185,17 @@ abstract class Game(val name: String, val mapName: String, val mode: String? = n
private val isJoinable
get() = state.canPlayersJoin

private fun removePlayer(player: Player) {
_players.remove(player)
callEvent(PlayerLeaveGameEvent(this, player))
}

fun addPlayer(player: Player, sendPlayer: Boolean = true): CompletableFuture<Instance> {
findGame(player)?.players?.remove(player)
players.add(player)
findGame(player)?.removePlayer(player)
_players.add(player)
if (sendPlayer && (player.instance == null || !ownsInstance(player.instance!!))) {
try {
return sendPlayerToInstance(player)
return sendPlayerToInstance(player).whenComplete { _, _ -> callEvent(PlayerJoinGameEvent(player, this))}
} catch (e: Throwable) {
e.printStackTrace()
player.sendMessage(
Expand All @@ -209,8 +208,10 @@ abstract class Game(val name: String, val mapName: String, val mode: String? = n
name = Environment.defaultGameName
selectors += GameTypeFieldSelector.GAME_NAME
})
return AsyncUtils.empty()
}
}
callEvent(PlayerJoinGameEvent(player, this))
return AsyncUtils.empty()
}

Expand All @@ -223,7 +224,7 @@ abstract class Game(val name: String, val mapName: String, val mode: String? = n
return player.setInstance(instance).thenApply { instance }
}

override fun getPlayers(): MutableCollection<Player> = players
override fun getPlayers(): MutableCollection<Player> = _players

open fun endGameLater(delay: Duration = Duration.ZERO) {
state = GameState.ENDING
Expand Down Expand Up @@ -320,7 +321,7 @@ abstract class Game(val name: String, val mapName: String, val mode: String? = n
}
}.executionType(ExecutionType.TICK_START).delay(Duration.ofSeconds(10))

players.clear()
while (players.isNotEmpty()) removePlayer(players.first())
}

open fun isInactive(): Boolean {
Expand Down Expand Up @@ -413,7 +414,7 @@ abstract class Game(val name: String, val mapName: String, val mode: String? = n
logger.info("Ending inactive game ${game.id} (${game.name}/${game.mapName}/${game.mode})")
game.endGame(false)
}
game.players.removeIf { player -> !player.isOnline }
game._players.removeIf { player -> !player.isOnline }
}

instances.forEach { instance ->
Expand Down
12 changes: 12 additions & 0 deletions common/src/main/kotlin/com/bluedragonmc/server/event/PlayerJoinGameEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.bluedragonmc.server.event

import com.bluedragonmc.server.Game
import net.minestom.server.entity.Player
import net.minestom.server.event.trait.PlayerEvent

/**
* Called when a player joins the game.
*/
class PlayerJoinGameEvent(private val player: Player, game: Game) : GameEvent(game), PlayerEvent {
override fun getPlayer(): Player = player
}
4 changes: 2 additions & 2 deletions common/src/main/kotlin/com/bluedragonmc/server/module/combat/OldCombatModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.bluedragonmc.server.module.combat

import com.bluedragonmc.server.CustomPlayer
import com.bluedragonmc.server.Game
import com.bluedragonmc.server.event.PlayerJoinGameEvent
import com.bluedragonmc.server.event.PlayerKillPlayerEvent
import com.bluedragonmc.server.event.PlayerLeaveGameEvent
import com.bluedragonmc.server.module.GameModule
Expand All @@ -19,7 +20,6 @@ import net.minestom.server.event.entity.EntityAttackEvent
import net.minestom.server.event.entity.EntityPotionAddEvent
import net.minestom.server.event.entity.EntityTickEvent
import net.minestom.server.event.item.PlayerFinishItemUseEvent
import net.minestom.server.event.player.PlayerSpawnEvent
import net.minestom.server.event.trait.CancellableEvent
import net.minestom.server.event.trait.PlayerInstanceEvent
import net.minestom.server.instance.Instance
Expand Down Expand Up @@ -94,7 +94,7 @@ class OldCombatModule(var allowDamage: Boolean = true, var allowKnockback: Boole
}
}

eventNode.addListener(PlayerSpawnEvent::class.java) { event ->
eventNode.addListener(PlayerJoinGameEvent::class.java) { event ->
// Hint to client that there is no attack cooldown
event.player.getAttribute(Attribute.ATTACK_SPEED).baseValue = 100.0
event.player.getAttribute(Attribute.ATTACK_DAMAGE).baseValue = 1.0
Expand Down
6 changes: 3 additions & 3 deletions common/src/main/kotlin/com/bluedragonmc/server/module/gameplay/MaxHealthModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package com.bluedragonmc.server.module.gameplay

import com.bluedragonmc.server.Game
import com.bluedragonmc.server.event.PlayerJoinGameEvent
import com.bluedragonmc.server.event.PlayerLeaveGameEvent
import com.bluedragonmc.server.module.GameModule
import net.minestom.server.entity.attribute.Attribute
import net.minestom.server.event.Event
import net.minestom.server.event.EventNode
import net.minestom.server.event.player.PlayerSpawnEvent

/**
* Sets the max health of the player when they join the instance.
* Sets the max health of the player when they join the game.
* This sets the base value of the attribute, it does not add a modifier.
* The module automatically resets their max health to 20 when they leave the instance.
*/
class MaxHealthModule(private val maxHealth: Double) : GameModule() {

override fun initialize(parent: Game, eventNode: EventNode<Event>) {
eventNode.addListener(PlayerSpawnEvent::class.java) { event ->
eventNode.addListener(PlayerJoinGameEvent::class.java) { event ->
event.player.getAttribute(Attribute.MAX_HEALTH).baseValue = maxHealth
}
eventNode.addListener(PlayerLeaveGameEvent::class.java) { event ->
Expand Down
12 changes: 6 additions & 6 deletions common/src/main/kotlin/com/bluedragonmc/server/module/gameplay/SidebarModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ package com.bluedragonmc.server.module.gameplay

import com.bluedragonmc.server.*
import com.bluedragonmc.server.api.Environment
import com.bluedragonmc.server.event.CountdownEvent
import com.bluedragonmc.server.event.GameStartEvent
import com.bluedragonmc.server.event.GameStateChangedEvent
import com.bluedragonmc.server.event.PlayerLeaveGameEvent
import com.bluedragonmc.server.event.*
import com.bluedragonmc.server.module.GameModule
import com.bluedragonmc.server.utils.GameState
import com.bluedragonmc.server.utils.plus
import com.bluedragonmc.server.utils.withGradient
import com.bluedragonmc.server.utils.withTransition
import kotlinx.coroutines.runBlocking
import net.kyori.adventure.text.Component
import net.kyori.adventure.text.Component.text
import net.kyori.adventure.text.format.NamedTextColor.DARK_GRAY
import net.kyori.adventure.text.format.NamedTextColor.RED
import net.kyori.adventure.text.format.NamedTextColor.YELLOW
import net.kyori.adventure.text.format.NamedTextColor.GREEN
import net.kyori.adventure.text.format.TextDecoration
import net.kyori.adventure.translation.GlobalTranslator
import net.minestom.server.MinecraftServer
import net.minestom.server.entity.Player
import net.minestom.server.event.Event
import net.minestom.server.event.EventNode
import net.minestom.server.event.player.PlayerSpawnEvent
import net.minestom.server.scoreboard.Sidebar
import net.minestom.server.scoreboard.Sidebar.ScoreboardLine
import java.util.*
Expand All @@ -43,7 +43,7 @@ class SidebarModule(private val title: String) : GameModule() {
if (::binding.isInitialized)
binding.updateFor(player)
}
eventNode.addListener(PlayerSpawnEvent::class.java) { event ->
eventNode.addListener(PlayerJoinGameEvent::class.java) { event ->
val sidebar = sidebars.getOrPut(event.player) { createSidebar() }
sidebar.addViewer(event.player)
if (::binding.isInitialized)
Expand Down
3 changes: 2 additions & 1 deletion common/src/main/kotlin/com/bluedragonmc/server/module/minigame/CountdownModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.bluedragonmc.server.BRAND_COLOR_PRIMARY_2
import com.bluedragonmc.server.Game
import com.bluedragonmc.server.event.CountdownEvent
import com.bluedragonmc.server.event.GameStartEvent
import com.bluedragonmc.server.event.PlayerJoinGameEvent
import com.bluedragonmc.server.module.GameModule
import com.bluedragonmc.server.utils.GameState
import net.kyori.adventure.text.Component
Expand Down Expand Up @@ -34,7 +35,7 @@ class CountdownModule(
fun getTimeLeft() = secondsLeft ?: countdownSeconds

override fun initialize(parent: Game, eventNode: EventNode<Event>) {
eventNode.addListener(PlayerSpawnEvent::class.java) {
eventNode.addListener(PlayerJoinGameEvent::class.java) {
if (parent.state == GameState.STARTING || parent.state == GameState.INGAME || parent.state == GameState.ENDING || countdownRunning) return@addListener
if (threshold > 0 && parent.players.size >= threshold) {
startCountdown(parent)
Expand Down
5 changes: 2 additions & 3 deletions common/src/main/kotlin/com/bluedragonmc/server/module/minigame/KitsModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.bluedragonmc.server.module.minigame
import com.bluedragonmc.server.Game
import com.bluedragonmc.server.event.GameStartEvent
import com.bluedragonmc.server.event.KitSelectedEvent
import com.bluedragonmc.server.event.PlayerJoinGameEvent
import com.bluedragonmc.server.module.DependsOn
import com.bluedragonmc.server.module.GameModule
import com.bluedragonmc.server.module.GuiModule
Expand All @@ -13,7 +14,6 @@ import net.minestom.server.component.DataComponents
import net.minestom.server.entity.Player
import net.minestom.server.event.Event
import net.minestom.server.event.EventNode
import net.minestom.server.event.player.PlayerSpawnEvent
import net.minestom.server.inventory.InventoryType
import net.minestom.server.item.ItemStack
import net.minestom.server.item.Material
Expand All @@ -40,8 +40,7 @@ open class KitsModule(
override fun initialize(parent: Game, eventNode: EventNode<Event>) {
this.parent = parent
// todo add support for unlockable kits
// todo make this use a "player join game event" instead of spawn event
eventNode.addListener(PlayerSpawnEvent::class.java) { event ->
eventNode.addListener(PlayerJoinGameEvent::class.java) { event ->
if (showMenu) {
selectKit(event.player)
}
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/kotlin/com/bluedragonmc/server/module/minigame/MOTDModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.bluedragonmc.server.module.minigame
import com.bluedragonmc.server.BRAND_COLOR_PRIMARY_1
import com.bluedragonmc.server.BRAND_COLOR_PRIMARY_2
import com.bluedragonmc.server.Game
import com.bluedragonmc.server.event.PlayerJoinGameEvent
import com.bluedragonmc.server.module.GameModule
import com.bluedragonmc.server.module.SoftDependsOn
import com.bluedragonmc.server.module.config.ConfigModule
Expand All @@ -16,7 +17,6 @@ import net.kyori.adventure.text.format.NamedTextColor
import net.kyori.adventure.text.format.TextDecoration
import net.minestom.server.event.Event
import net.minestom.server.event.EventNode
import net.minestom.server.event.player.PlayerSpawnEvent

/**
* Displays a message to players when they join the game.
Expand All @@ -35,7 +35,7 @@ class MOTDModule(private val motd: Component, private var showMapName: Boolean =
val description = node?.node("description")?.string ?: "An awesome map!"
val author = node?.node("author")?.string ?: "BlueDragon Build Team"

eventNode.addListener(PlayerSpawnEvent::class.java) { event ->
eventNode.addListener(PlayerJoinGameEvent::class.java) { event ->
event.player.sendMessage(
buildComponent {
// Game name
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/kotlin/com/bluedragonmc/server/module/minigame/PlayerResetModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.bluedragonmc.server.module.minigame

import com.bluedragonmc.server.Game
import com.bluedragonmc.server.event.PlayerJoinGameEvent
import com.bluedragonmc.server.module.GameModule
import net.kyori.adventure.nbt.CompoundBinaryTag
import net.minestom.server.entity.GameMode
import net.minestom.server.entity.Player
import net.minestom.server.entity.attribute.Attribute
import net.minestom.server.event.Event
import net.minestom.server.event.EventNode
import net.minestom.server.event.player.PlayerSpawnEvent

/**
* "Resets" the player when they join the game. This changes some basic attributes to make sure effects don't persist in between games.
Expand All @@ -25,7 +25,7 @@ import net.minestom.server.event.player.PlayerSpawnEvent
*/
class PlayerResetModule(val defaultGameMode: GameMode? = null) : GameModule() {
override fun initialize(parent: Game, eventNode: EventNode<Event>) {
eventNode.addListener(PlayerSpawnEvent::class.java) { event ->
eventNode.addListener(PlayerJoinGameEvent::class.java) { event ->
resetPlayer(event.player, defaultGameMode)
}
}
Expand Down
12 changes: 7 additions & 5 deletions common/src/main/kotlin/com/bluedragonmc/server/module/minigame/TeamModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,27 +163,29 @@ class TeamModule(
TEAM_COUNT
}

data class Team(
class Team(
val name: Component = Component.empty(),
val players: MutableList<Player> = CopyOnWriteArrayList(),
players: List<Player> = CopyOnWriteArrayList(),
val allowFriendlyFire: Boolean = false,
val nameTagVisibility: NameTagVisibility = NameTagVisibility.ALWAYS,
) : PacketGroupingAudience {
val uuid: UUID = UUID.randomUUID()
private val _players = players.toMutableList()
val players: List<Player> = _players

lateinit var scoreboardTeam: net.minestom.server.scoreboard.Team
private set

override fun getPlayers(): MutableCollection<Player> = players
override fun getPlayers(): Collection<Player> = players

fun addPlayer(player: Player) {
players.add(player)
_players.add(player)
if (::scoreboardTeam.isInitialized)
scoreboardTeam.addMember(player.username)
}

fun removePlayer(player: Player) {
players.remove(player)
_players.remove(player)
if (::scoreboardTeam.isInitialized)
scoreboardTeam.removeMember(player.username)
}
Expand Down
8 changes: 2 additions & 6 deletions common/src/main/kotlin/com/bluedragonmc/server/module/minigame/VoteStartModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ package com.bluedragonmc.server.module.minigame

import com.bluedragonmc.server.BRAND_COLOR_PRIMARY_2
import com.bluedragonmc.server.Game
import com.bluedragonmc.server.event.CountdownEvent
import com.bluedragonmc.server.event.GameStartEvent
import com.bluedragonmc.server.event.GameStateChangedEvent
import com.bluedragonmc.server.event.PlayerLeaveGameEvent
import com.bluedragonmc.server.event.*
import com.bluedragonmc.server.module.GameModule
import com.bluedragonmc.server.utils.GameState
import com.bluedragonmc.server.utils.manage
Expand All @@ -20,7 +17,6 @@ import net.minestom.server.entity.Player
import net.minestom.server.entity.PlayerHand
import net.minestom.server.event.Event
import net.minestom.server.event.EventNode
import net.minestom.server.event.player.PlayerSpawnEvent
import net.minestom.server.event.player.PlayerUseItemEvent
import net.minestom.server.item.ItemStack
import net.minestom.server.item.Material
Expand Down Expand Up @@ -50,7 +46,7 @@ class VoteStartModule(

override fun initialize(parent: Game, eventNode: EventNode<Event>) {
this.parent = parent
eventNode.addListener(PlayerSpawnEvent::class.java) { event ->
eventNode.addListener(PlayerJoinGameEvent::class.java) { event ->
fill(event.player, voteStartItem)
}
eventNode.addListener(PlayerUseItemEvent::class.java) { event ->
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/kotlin/com/bluedragonmc/server/module/vanilla/ChestModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ChestModule : GameModule() {
}
}

private val chests = mutableMapOf<Point, ChestBlock>()
val chests = mutableMapOf<Point, ChestBlock>()

abstract class ChestBlock {

Expand Down
Loading
Loading