curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: sinking platform taking actors with it

Browse Source
This commit is contained in:
minjaesong
2026-02-09 02:59:59 +09:00
parent e91b7ceb0d
commit 54715e41b0
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/net/torvald/terrarum/gameactors/PhysContraption.kt
View File

@@ -83,11 +83,22 @@ abstract class PhysContraption() : ActorWithBody() {
rider.hitbox.setPositionX(oldRiderX) rider.hitbox.setPositionX(oldRiderX)
} }
// Snap to contraption surface (sets Y), then check for ceiling collision // Snap to contraption surface (sets Y), then check for terrain collision
snapRiderToSurface(rider) snapRiderToSurface(rider)
if (!rider.isNoCollideWorld && rider.isWalled(rider.hitbox, COLLIDING_TOP)) { if (!rider.isNoCollideWorld) {
if (rider.isWalled(rider.hitbox, COLLIDING_TOP)) {
// Ceiling: revert Y
rider.hitbox.setPositionY(oldRiderY) rider.hitbox.setPositionY(oldRiderY)
} }
if (rider.isWalled(rider.hitbox, COLLIDING_BOTTOM)) {
// Terrain beneath rider — platform sank into ground.
// Revert Y so rider stands on terrain, then dismount.
rider.hitbox.setPositionY(oldRiderY)
actorsRiding.remove(rider.referenceID)
rider.platformsRiding.remove(this.referenceID)
continue
}
}
if (rider.externalV.y > 0.0) { if (rider.externalV.y > 0.0) {
rider.externalV.y = 0.0 rider.externalV.y = 0.0
@@ -140,7 +151,7 @@ abstract class PhysContraption() : ActorWithBody() {
// --- Step 2b: Mount detection for new candidates --- // --- Step 2b: Mount detection for new candidates ---
val candidates: List<ActorWithBody> = (INGAME.actorContainerActive.filterIsInstance<ActorWithBody>().filter { it !== this && it !is PhysContraption } + INGAME.actorNowPlaying).filterNotNull() val candidates: List<ActorWithBody> = (INGAME.actorContainerActive.filterIsInstance<ActorWithBody>().filter { it !== this && it !is PhysContraption && it.physProp.usePhysics } + INGAME.actorNowPlaying).filterNotNull()
for (actor in candidates) { for (actor in candidates) {
if (actorsRiding.contains(actor.referenceID)) continue if (actorsRiding.contains(actor.referenceID)) continue