moritzruth/spigot-ttt
Archived
1
0
Fork 0
Code Activity

Fix death players not seeing each other as spectators

Browse source
This commit is contained in:
Moritz Ruth 2020-06-22 17:31:54 +02:00
parent a6ca587655
commit d31b44693f
No known key found for this signature in database
GPG key ID: AFD57E23E753841B
2 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/kotlin/de/moritzruth/spigot_ttt/game/GeneralGameListener.kt
View file

@ -186,6 +186,7 @@ object GeneralGameListener : Listener {
val packetListener = object : PacketAdapter(plugin, PacketType.Play.Server.PLAYER_INFO) { val packetListener = object : PacketAdapter(plugin, PacketType.Play.Server.PLAYER_INFO) {
override fun onPacketSending(event: PacketEvent) { override fun onPacketSending(event: PacketEvent) {
val receivingTTTPlayer = TTTPlayer.of(event.player) ?: return
val packet = WrapperPlayServerPlayerInfo(event.packet) val packet = WrapperPlayServerPlayerInfo(event.packet)
if ( if (
@ -196,15 +197,23 @@ object GeneralGameListener : Listener {
val tttPlayer = PlayerManager.tttPlayers.find { it.player.uniqueId == info.profile.uuid } val tttPlayer = PlayerManager.tttPlayers.find { it.player.uniqueId == info.profile.uuid }
if (tttPlayer == null) info if (tttPlayer == null) info
else PlayerInfoData( else {
info.profile, val nativeGameMode = when {
info.latency, event.player.uniqueId == info.profile.uuid -> {
if (event.player.uniqueId == info.profile.uuid) { if (event.player.gameMode == GameMode.SPECTATOR) EnumWrappers.NativeGameMode.SPECTATOR
if (event.player.gameMode == GameMode.SPECTATOR) EnumWrappers.NativeGameMode.SPECTATOR else EnumWrappers.NativeGameMode.SURVIVAL
else EnumWrappers.NativeGameMode.SURVIVAL }
} else EnumWrappers.NativeGameMode.SURVIVAL, !receivingTTTPlayer.alive && !tttPlayer.alive -> EnumWrappers.NativeGameMode.SPECTATOR
info.displayName else -> EnumWrappers.NativeGameMode.SURVIVAL
) }
PlayerInfoData(
info.profile,
info.latency,
nativeGameMode,
info.displayName
)
}
}.toMutableList() }.toMutableList()
} }
} }

23
src/main/kotlin/de/moritzruth/spigot_ttt/game/players/TTTPlayer.kt
View file

@ -1,5 +1,10 @@
package de.moritzruth.spigot_ttt.game.players package de.moritzruth.spigot_ttt.game.players
import com.comphenix.packetwrapper.WrapperPlayServerPlayerInfo
import com.comphenix.protocol.wrappers.EnumWrappers
import com.comphenix.protocol.wrappers.PlayerInfoData
import com.comphenix.protocol.wrappers.WrappedChatComponent
import com.comphenix.protocol.wrappers.WrappedGameProfile
import de.moritzruth.spigot_ttt.Resourcepack import de.moritzruth.spigot_ttt.Resourcepack
import de.moritzruth.spigot_ttt.Settings import de.moritzruth.spigot_ttt.Settings
import de.moritzruth.spigot_ttt.TTTPlugin import de.moritzruth.spigot_ttt.TTTPlugin
@ -21,6 +26,24 @@ import org.bukkit.entity.Player
class TTTPlayer(player: Player, role: Role, val tttClass: TTTClassCompanion = TTTClass.None) { class TTTPlayer(player: Player, role: Role, val tttClass: TTTClassCompanion = TTTClass.None) {
var alive = true var alive = true
set(value) {
field = value
val packet = WrapperPlayServerPlayerInfo()
packet.action = EnumWrappers.PlayerInfoAction.UPDATE_GAME_MODE
packet.data = PlayerManager.tttPlayers
.map { tttPlayer ->
PlayerInfoData(
WrappedGameProfile.fromPlayer(tttPlayer.player),
1,
if (alive || tttPlayer.alive) EnumWrappers.NativeGameMode.SURVIVAL
else EnumWrappers.NativeGameMode.SPECTATOR,
WrappedChatComponent.fromText(tttPlayer.player.displayName)
) }
nextTick {
packet.sendPacket(player)
}
}
// Used for corpse clicks // Used for corpse clicks
var ignoreNextInteract = false var ignoreNextInteract = false