Skip to content

Small fixes #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GregHib merged 2 commits into from
May 18, 2026
Merged

Small fixes #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cab9095
Remove addFirst usages
GregHib May 18, 2026
1507b11
Fix dynamic region packet writing too many xteas
GregHib May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion game/src/main/kotlin/content/area/wilderness/daemonheim/DungeoneeringParty.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion game/src/main/kotlin/content/entity/player/kept/ItemsKeptOnDeath.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
Expand Down
11 changes: 3 additions & 8 deletions game/src/main/kotlin/content/entity/world/RegionLoading.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ class RegionLoading(val dynamicZones: DynamicZones) : Script {
}

viewport.dynamic = false

player.client?.mapRegion(
zoneX = zoneX,
zoneY = zoneY,
Expand All @@ -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<Int>()
val xteaList = mutableListOf<IntArray>()
val zones = mutableListOf<Int?>()

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) {
Expand All @@ -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,
Expand Down
Loading