mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-19 00:37:20 +07:00
Code Issues Packages Projects Releases Wiki Activity

Possible entity collision variable overwrite fix

Browse Source
This commit is contained in:
Anuken 2024-05-25 21:50:12 -04:00
parent 0a1c10192e
commit a0569a63bc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ public class EntityCollisions{
//tile collisions //tile collisions
private Vec2 vector = new Vec2(), l1 = new Vec2(); private Vec2 vector = new Vec2(), l1 = new Vec2();
private Rect r1 = new Rect(), r2 = new Rect(), tmp = new Rect(); private Rect r1 = new Rect(), r2 = new Rect(), r3 = new Rect(), r4 = new Rect(), tmp = new Rect();
//entity collisions //entity collisions
private Seq<Hitboxc> arrOut = new Seq<>(Hitboxc.class); private Seq<Hitboxc> arrOut = new Seq<>(Hitboxc.class);
@ -218,12 +218,12 @@ public class EntityCollisions{
} }
private void updateCollision(Hitboxc solid){ private void updateCollision(Hitboxc solid){
solid.hitbox(r1); solid.hitbox(r3);
r1.x += (solid.lastX() - solid.getX()); r3.x += (solid.lastX() - solid.getX());
r1.y += (solid.lastY() - solid.getY()); r3.y += (solid.lastY() - solid.getY());
solid.hitbox(r2); solid.hitbox(r4);
r2.merge(r1); r4.merge(r3);
arrOut.clear(); arrOut.clear();
@ -235,8 +235,8 @@ public class EntityCollisions{
for(int i = 0; i < size; i++){ for(int i = 0; i < size; i++){
Hitboxc sc = items[i]; Hitboxc sc = items[i];
sc.hitbox(r1); sc.hitbox(r3);
if(r2.overlaps(r1)){ if(r4.overlaps(r3)){
checkCollide(solid, sc); checkCollide(solid, sc);
//break out of loop when this object hits something //break out of loop when this object hits something
if(!solid.isAdded()) return; if(!solid.isAdded()) return;