AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-19 04:15:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

forbid movement across world border (in outside direction)

Browse Source
This commit is contained in:
Bixilon 2022-04-26 21:12:48 +02:00
parent 9807128c5b
commit c1b4559667
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.kt
View File

@ -396,6 +396,8 @@ abstract class Entity(
} }
fun move(delta: Vec3d = velocity) { fun move(delta: Vec3d = velocity) {
val positionBefore = position
val wasInBorder = !connection.world.border.isOutside(positionBefore)
if (!hasCollisions) { if (!hasCollisions) {
forceMove(delta) forceMove(delta)
return return
@ -415,9 +417,21 @@ abstract class Entity(
movement = connection.collisionDetector.sneak(this, movement) movement = connection.collisionDetector.sneak(this, movement)
} }
val collisionMovement = connection.collisionDetector.collide(null, movement, aabb, true) var collisionMovement = connection.collisionDetector.collide(null, movement, aabb, true)
val targetPosition = positionBefore + collisionMovement
val inBorder = !connection.world.border.isOutside(targetPosition)
if (wasInBorder && !inBorder) {
val border = connection.world.border
val xDirection = if (collisionMovement.x < 0) -1 else 1
val zDirection = if (collisionMovement.z < 0) -1 else 1
collisionMovement = Vec3d(
xDirection * minOf(abs(collisionMovement.x), border.diameter / 2 - abs(targetPosition.x) - abs(border.center.x), 0.0),
collisionMovement.y,
zDirection * minOf(abs(collisionMovement.z), border.diameter / 2 - abs(targetPosition.z) - abs(border.center.y), 0.0)
)
}
forceMove(collisionMovement) forceMove(collisionMovement)