diff --git a/game/src/main/kotlin/content/area/wilderness/daemonheim/DungeoneeringParty.kt b/game/src/main/kotlin/content/area/wilderness/daemonheim/DungeoneeringParty.kt index 3e38effa9a..a5307d0980 100644 --- a/game/src/main/kotlin/content/area/wilderness/daemonheim/DungeoneeringParty.kt +++ b/game/src/main/kotlin/content/area/wilderness/daemonheim/DungeoneeringParty.kt @@ -346,7 +346,7 @@ class DungeoneeringParty : Script { val members = leader.dungeonMembers.toMutableList() if (members.size > 1) { members.remove(promote) - members.addFirst(promote) + members.add(0, promote) } promote["dungeoneering_party_leader"] = promote.name promote.dungeonMembers = members diff --git a/game/src/main/kotlin/content/entity/player/kept/ItemsKeptOnDeath.kt b/game/src/main/kotlin/content/entity/player/kept/ItemsKeptOnDeath.kt index 36c4e299bd..fdfcf8b81f 100644 --- a/game/src/main/kotlin/content/entity/player/kept/ItemsKeptOnDeath.kt +++ b/game/src/main/kotlin/content/entity/player/kept/ItemsKeptOnDeath.kt @@ -50,7 +50,7 @@ object ItemsKeptOnDeath { kept.add(queue.pop()) } else if (item.amount > 1) { queue.pop() - queue.addFirst(item.copy(amount = item.amount - 1)) + queue.add(0, item.copy(amount = item.amount - 1)) kept.add(item.copy(amount = 1)) } } diff --git a/game/src/main/kotlin/content/entity/world/RegionLoading.kt b/game/src/main/kotlin/content/entity/world/RegionLoading.kt index 4fde448721..446e57528c 100644 --- a/game/src/main/kotlin/content/entity/world/RegionLoading.kt +++ b/game/src/main/kotlin/content/entity/world/RegionLoading.kt @@ -144,7 +144,6 @@ class RegionLoading(val dynamicZones: DynamicZones) : Script { } viewport.dynamic = false - player.client?.mapRegion( zoneX = zoneX, zoneY = zoneY, @@ -160,12 +159,12 @@ class RegionLoading(val dynamicZones: DynamicZones) : Script { fun updateDynamic(player: Player, initial: Boolean, force: Boolean) { val viewport = player.viewport ?: return + val distinct = mutableSetOf() val xteaList = mutableListOf() val zones = mutableListOf() val view = player.tile.zone.minus(viewport.zoneRadius, viewport.zoneRadius) val zoneSize = viewport.zoneArea - var append = 0 val xtea = blankXtea for (lvl in 0..3) { for (x in 0 until zoneSize) { @@ -177,17 +176,13 @@ class RegionLoading(val dynamicZones: DynamicZones) : Script { continue } zones.add(target) - if (!xteaList.contains(xtea)) { + val original = DynamicZones.getZone(target).region + if (distinct.add(original.id)) { xteaList.add(xtea) - } else { - append++ } } } } - for (i in 0..append) { - xteaList.add(xtea) - } viewport.dynamic = true player.client?.dynamicMapRegion( zoneX = player.tile.zone.x,