DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Misc fixes

Browse Source
This commit is contained in:
DBotThePony 2022-02-20 14:38:42 +07:00
parent 6b32d0f0c4
commit c82c89dfec
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/kbox2d/kotlin/ru/dbotthepony/kbox2d/dynamics/B2Body.kt
View File

@ -1,3 +1,6 @@
@file:Suppress("unused")
package ru.dbotthepony.kbox2d.dynamics
import ru.dbotthepony.kbox2d.api.*
@ -273,7 +276,7 @@ class B2Body(def: BodyDef, world: B2World) {
val broadPhase = world.contactManager.broadPhase
for (fixture in fixtureIterator) {
(fixture as B2Fixture).createProxies(broadPhase, transform)
fixture.createProxies(broadPhase, transform)
}
world.notifyNewContacts()
@ -284,7 +287,7 @@ class B2Body(def: BodyDef, world: B2World) {
val broadPhase = world.contactManager.broadPhase
for (fixture in fixtureIterator) {
(fixture as B2Fixture).destroyProxies(broadPhase)
fixture.destroyProxies(broadPhase)
}
// Destroy the attached contacts.
@ -478,8 +481,6 @@ class B2Body(def: BodyDef, world: B2World) {
}
}
fixture as B2Fixture
if (isEnabled) {
fixture.destroyProxies(world.contactManager.broadPhase)
}
@ -868,11 +869,11 @@ class B2Body(def: BodyDef, world: B2World) {
transform1.position = sweep.c0 - transform1.rotation.times(sweep.localCenter)
for (fixture in fixtureIterator) {
(fixture as B2Fixture).synchronize(broadPhase, transform1, transform)
fixture.synchronize(broadPhase, transform1, transform)
}
} else {
for (fixture in fixtureIterator) {
(fixture as B2Fixture).synchronize(broadPhase, transform, transform)
fixture.synchronize(broadPhase, transform, transform)
}
}
}

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/Chunk.kt
View File

@ -464,7 +464,7 @@ abstract class Chunk<WorldType : World<WorldType, This>, This : Chunk<WorldType,
}
override fun randomLongFor(x: Int, y: Int): Long {
return super.randomLongFor(x, y) xor (world?.seed ?: 0L)
return super.randomLongFor(x, y) xor world.seed
}
}

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
View File

@ -442,8 +442,6 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
}
}
}
potentialAABB = worldaabb + deltaMovement
}
}