Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clamp movement vectors to prevent infinite loops

Browse Source
This commit is contained in:
Anuken
2025-04-25 14:04:18 -04:00
parent f5a0b5ec1a
commit ca19d525c4
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/entities/EntityCollisions.java
View File

@@ -12,7 +12,7 @@ import static mindustry.Vars.*;
public class EntityCollisions{ public class EntityCollisions{
//move in 1-unit chunks (can this be made more efficient?) //move in 1-unit chunks (can this be made more efficient?)
private static final float seg = 1f; private static final float seg = 1f, maxDelta = 1000f;
//tile collisions //tile collisions
private Vec2 vector = new Vec2(), l1 = new Vec2(); private Vec2 vector = new Vec2(), l1 = new Vec2();
@@ -34,7 +34,11 @@ public class EntityCollisions{
} }
public void move(Hitboxc entity, float deltax, float deltay, SolidPred solidCheck){ public void move(Hitboxc entity, float deltax, float deltay, SolidPred solidCheck){
if(Math.abs(deltax) < 0.0001f & Math.abs(deltay) < 0.0001f) return; //check for NaN
if((Math.abs(deltax) < 0.0001f && Math.abs(deltay) < 0.0001f) || deltax != deltax || deltay != deltay) return;
deltax = Mathf.clamp(deltax, -maxDelta, maxDelta);
deltay = Mathf.clamp(deltay, -maxDelta, maxDelta);
boolean movedx = false; boolean movedx = false;
entity.hitboxTile(r1); entity.hitboxTile(r1);