Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Merge branch 'main' into TNTLeague/BiggerCoins

Browse Source
This commit is contained in:
YoyoNow
2025-04-17 21:18:40 +02:00
parent 20c90d9af5 f74780d395
commit 61d84492dc
205 changed files with 11256 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TNTLeague/src/de/steamwar/tntleague/events/GlobalListener.kt
+3 -3
View File
@@ -66,7 +66,7 @@ object GlobalListener: Listener {
fun onPlayerMove(e: PlayerMoveEvent) {
if (e.to.blockY < TNTLeagueWorldConfig.minHeight) {
when (val team = TNTLeagueGame.getTeam(e.player)) {
is TNTLeagueTeam -> e.player.teleport(team.config.spawnLocation)
is TNTLeagueTeam -> e.player.teleport(team.config.worldConfig.spawnLocation)
null -> e.player.teleport(TNTLeagueWorldConfig.blueTeam.spawnLocation)
}
}
@@ -87,7 +87,7 @@ object GlobalListener: Listener {
@EventHandler
fun onPlayerRespawn(e: PlayerRespawnEvent) {
when (val team = TNTLeagueGame.getTeam(e.player)) {
is TNTLeagueTeam -> e.respawnLocation = team.config.spawnLocation
is TNTLeagueTeam -> e.respawnLocation = team.config.worldConfig.spawnLocation
null -> e.respawnLocation = TNTLeagueWorldConfig.lobby
}
}
@@ -100,7 +100,7 @@ object GlobalListener: Listener {
val fightTeam = TNTLeagueGame.getTeam(player)
if (fightTeam != null) {
message.broadcastPrefixless("PARTICIPANT_CHAT", SubMessage(fightTeam.name), player.name, msg)
message.broadcastPrefixless("PARTICIPANT_CHAT", fightTeam.name, player.name, msg)
} else {
message.broadcastPrefixless("SPECTATOR_CHAT", player.name, msg)
}
TNTLeague/src/de/steamwar/tntleague/events/LobbyListener.kt
-1
View File
@@ -23,7 +23,6 @@ import de.steamwar.tntleague.game.TNTLeagueGame
import org.bukkit.GameMode
import org.bukkit.entity.EntityType
import org.bukkit.event.EventHandler
import org.bukkit.event.EventPriority
import org.bukkit.event.Listener
import org.bukkit.event.entity.EntityDamageEvent
import org.bukkit.event.inventory.InventoryClickEvent