2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2026-08-23 03:15:10 -06:00
Code Issues Projects Releases Packages Wiki Activity

Making IDE "warnings" happy

Browse source
This commit is contained in:
Tooze 2026-04-12 10:48:32 -04:00
parent 04bb8d51ab
commit a5b4bd25a3
4 changed files with 12 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Server/src/main/content/minigame/barbassault/CommanderConnad.kt
View file

@ -54,7 +54,7 @@ class CommanderConnad(player: Player? = null) : DialoguePlugin(player) {
openInterface(player,Components.BARBASSAULT_REWARD_SHOP_491)
}
//Point Check
25 -> npcl(FacialExpression.FRIENDLY,"Let me check...").also { stage = getBarbPointStage(player,barbasspoints.total) }
25 -> npcl(FacialExpression.FRIENDLY,"Let me check...").also { stage = getBarbPointStage(barbasspoints.total) }
26 -> npcl(FacialExpression.FRIENDLY,"You have absolutely no points, whatsoever. Best you get back into that arena!").also { stage = 10 }
27 -> npcl(FacialExpression.FRIENDLY,"You have: ${barbasspoints.atk} Attacker Honour Points, ${barbasspoints.def} Defender Honour Points, ${barbasspoints.col} Collector Honour Points and ${barbasspoints.heal} Healer Honour Points.").also { stage = 10 }
@ -88,7 +88,7 @@ class CommanderConnad(player: Player? = null) : DialoguePlugin(player) {
}
return true
}
private fun getBarbPointStage(player: Player, total: Int): Int {
private fun getBarbPointStage(total: Int): Int {
if (total == 0 ) return 26
return 27
}

34
Server/src/main/content/minigame/barbassault/arena/BarbassaultSession.kt
View file

@ -1,5 +1,6 @@
package content.minigame.barbassault.arena
import content.minigame.barbassault.ALL_BARBASS_ITEMS
import content.minigame.barbassault.BarbRole
import content.minigame.barbassault.BarbassaultActivity
import content.minigame.barbassault.arena.scenery.EggCannon
@ -46,7 +47,6 @@ class BarbassaultSession( val activity: BarbassaultActivity ? = null) :LogoutLi
val scoreManager = BarbScoreManager()
val eventBus = BarbAssEventBus()
val npcCaps = SpawnCaps(4,4,2,2)//wave 1
val endReason = "left"
private val countDoown = if(GameWorld.settings?.isDevMode == true) 4 else 60
@ -232,28 +232,10 @@ class BarbassaultSession( val activity: BarbassaultActivity ? = null) :LogoutLi
region.flagInactive()
}
val barbassItems = arrayOf(
Item(ATTACKER_ICON),
Item(Items.ATTACKER_HORN_10516), Item(Items.ATTACKER_HORN_10517), Item(Items.ATTACKER_HORN_10518), Item(Items.ATTACKER_HORN_10519), Item(Items.ATTACKER_HORN_10520),
Item(DEFENDER_ICON),
Item(Items.WORMS_10515),Item(Items.CRACKERS_10513), Item(Items.TOFU_10514),
Item(Items.LOGS_11760),Item(Items.HAMMER_2347),
Item(Items.DEFENDER_HORN_10538),
Item(HEALER_ICON),
Item(Items.HEALING_VIAL_10546),Item(Items.HEALING_VIAL1_10545),Item(Items.HEALING_VIAL2_10544),Item(Items.HEALING_VIAL3_10543),Item(Items.HEALING_VIAL4_10542),
Item(Items.HEALER_HORN_10526),Item(Items.HEALER_HORN_10527),Item(Items.HEALER_HORN_10528),Item(Items.HEALER_HORN_10529),Item(Items.HEALER_HORN_10530),
Item(Items.POISONED_WORMS_10540),Item(Items.POISONED_TOFU_10539),Item(Items.POISONED_MEAT_10541),
Item(COLLECTOR_ICON),
Item(Items.COLLECTOR_HORN_10560),
Item(Items.COLLECTION_BAG_10521),Item(Items.COLLECTION_BAG_10522),Item(Items.COLLECTION_BAG_10523),Item(Items.COLLECTION_BAG_10524),Item(Items.COLLECTION_BAG_10525),
Item(Items.BLUE_EGG_10533),Item(Items.RED_EGG_10532),Item(Items.GREEN_EGG_10531),
)
private fun handleLogout(player: Player) {
state = BarbassaultState.FORFEIT
zone.cleanItems(player,barbassItems)
zone.cleanItems(player,ALL_BARBASS_ITEMS)
region.remove(player)
team.removePlayer(player)
player.locks.unlockTeleport()
@ -302,7 +284,7 @@ class BarbassaultSession( val activity: BarbassaultActivity ? = null) :LogoutLi
var player = entity as Player
//exitMiniGame(player)
removeTimer(player, "teleblock")
zone.cleanItems(player,barbassItems)//region.remove(player)
zone.cleanItems(player,ALL_BARBASS_ITEMS)//region.remove(player)
clearLogoutListener(player, "ba-logout")
player.fullRestore()
@ -385,19 +367,17 @@ class BarbassaultSession( val activity: BarbassaultActivity ? = null) :LogoutLi
}
}
fun broadcastToRole(role: BarbRole, message: String) {
team.allPlayers().filter {
team.getRoleForPlayer(it) == role
}.forEach {
team.getPlayersByRole(role).forEach {
sendMessage(it, message)
}
}
fun updateBarbHealerIfaceHPOfPlayer(player: Player){
team.allPlayers().filter { team.getRoleForPlayer(it) == BarbRole.HEALER }.forEach {
HealerIfaceHPUpdatePlayer(it,player)
team.getPlayersByRole(BarbRole.HEALER).forEach {
HealerIfaceHPUpdatePlayer(it, player)
}
}
fun alertHealers(player:Player){
team.allPlayers().filter { team.getRoleForPlayer(it) == BarbRole.HEALER }.forEach {
team.getPlayersByRole(BarbRole.HEALER).forEach {
HealerIfaceMedicHelp(it,player)
}
}

6
Server/src/main/content/minigame/barbassault/lobby/AcceptRoleInterface.kt
View file

@ -16,7 +16,6 @@ import core.plugin.Plugin
@Initializable
class AcceptRoleInterface : ComponentPlugin() {
private var waitingStatus = true
override fun newInstance(arg: Any?): Plugin<Any> {
ComponentDefinition.forId(AcceptRole.ID).plugin = this
return this
@ -38,7 +37,6 @@ class AcceptRoleInterface : ComponentPlugin() {
player ?: return
val team = player.baSession?.team
val recruit = team?.recruit?.player
val teamLeader = team?.getLeader()
component?.setCloseEvent{ _, _ -> if (recruit != null && isopen) { closeInterface(recruit); isopen = false }; return@setCloseEvent true }
for (slotIndex in 0 until BarbTeam.MAX_SLOTS) {
@ -67,7 +65,7 @@ class AcceptRoleInterface : ComponentPlugin() {
return
}
val selectedRole = recruit?.role ?: return
val selectedRole = recruit.role ?: return
val roleName = selectedRole.name.lowercase().replaceFirstChar { it.uppercase() }
val rPlayer = recruit.player
if (joinTeam(rPlayer, selectedRole)) {
@ -105,7 +103,7 @@ class AcceptRoleInterface : ComponentPlugin() {
val recruit = team.recruit
val displayName = recruit?.role?.name?.lowercase()?.replaceFirstChar { it.uppercase() } ?: "Unknown"
val level = recruit?.roleLevel()
setInterfaceText(leader!!, displayName, AcceptRole.ID,AcceptRole.Status.selectedRole )
setInterfaceText(leader, displayName, AcceptRole.ID,AcceptRole.Status.selectedRole )
setInterfaceText(leader, level.toString(), AcceptRole.ID,AcceptRole.Status.levelRole )
}
fun resetWaitingStatus(player: Player?){

12
Server/src/main/content/minigame/barbassault/lobby/BarbTeam.kt
View file

@ -65,16 +65,6 @@ class BarbTeam(val session: BarbassaultSession, leader: Player) {
return true
}
/** fun removePlayer(player: Player) {
val idx = slotOf(player)
if (idx == -1) return
slots[idx] = null
player.team = null
player.removeAttribute(BA_SESSION_KEY)
clearLogoutListener(player, BA_SESSION_KEY)
//remove from barbsession barbmteam
}*/
fun removePlayer(player: Player) {
val idx = slotOf(player)
if (idx == -1) return
@ -90,7 +80,7 @@ class BarbTeam(val session: BarbassaultSession, leader: Player) {
return true
}
fun getAllRole(barbRole: BarbRole): List<Player> {
fun getPlayersByRole(barbRole: BarbRole): List<Player> {
return slots.filterNotNull().map { it.player }.filter { getRoleForPlayer(it) == barbRole }
}