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

Fix discord bot exception and ignore radar packet exceptions

Browse source
This commit is contained in:
Moritz Ruth 2020-06-04 21:00:39 +02:00
parent 166dd60493
commit b8f31b4204
No known key found for this signature in database
GPG key ID: AFD57E23E753841B
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/de/moritzruth/spigot_ttt/discord/DiscordBot.kt
View file

@ -29,7 +29,7 @@ object DiscordBot: ListenerAdapter() {
jda = JDABuilder.createDefault(plugin.config.getString("discord-token")).build()
jda.presence.setStatus(OnlineStatus.ONLINE)
jda.presence.activity = Activity.of(Activity.ActivityType.CUSTOM_STATUS, "Schick mir eine PN mit deinem Minecraft-Namen")
jda.presence.activity = Activity.of(Activity.ActivityType.DEFAULT, "Schick mir eine PN mit deinem Minecraft-Namen")
jda.addEventListener(this)
}

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

@ -27,7 +27,7 @@ class TTTPlayer(player: Player, role: Role) {
var player by Delegates.observable(player) { _, _, _ -> initializePlayer() }
var role by Delegates.observable(Role.TRAITOR) { _, _, _ -> scoreboard.updateRole() }
var role by Delegates.observable(role) { _, _, _ -> scoreboard.updateRole() }
val roleHistory = mutableListOf<Role>()
var itemInHand by Delegates.observable<TTTItem?>(null) { _, oldItem, newItem -> onItemInHandChanged(oldItem, newItem) }
@ -118,6 +118,7 @@ class TTTPlayer(player: Player, role: Role) {
player.gameMode = GameMode.SURVIVAL
player.activePotionEffects.forEach { player.removePotionEffect(it.type) }
player.health = 20.0
player.walkSpeed = 0.2F // yes, this is the default value
player.inventory.clear()
}
@ -182,4 +183,6 @@ class TTTPlayer(player: Player, role: Role) {
val position by lazy { values().indexOf(this) }
}
override fun toString() = "TTTPlayer(${player.name} is $role)"
}

12
src/main/kotlin/de/moritzruth/spigot_ttt/items/Radar.kt
View file

@ -47,11 +47,13 @@ object Radar: TTTItem, Buyable {
val tttPlayerOfPacket = PlayerManager.getTTTPlayer(playerOfPacket) ?: return
if (tttPlayerOfPacket.alive) {
// https://wiki.vg/Entity_metadata#Entity_Metadata_Format
val modifiers = packet.metadata[0].value as Byte
packet.metadata[0].setValue(
if (isc.get(tttPlayer).enabled) modifiers or 0x40
else modifiers and 0b10111111.toByte()
)
try {
val modifiers = packet.metadata[0].value as Byte // TODO: Fix this
packet.metadata[0].setValue(
if (isc.get(tttPlayer).enabled) modifiers or 0x40
else modifiers and 0b10111111.toByte()
)
} catch (ignored: Exception) {}
}
}
})