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

Fixed #7634

Browse Source
This commit is contained in:
Anuken
2022-09-28 17:00:02 -04:00
parent 01813c4339
commit b1fd87adbd
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,11 +16,8 @@ public class EntityCollisions{
private static final float seg = 1f; private static final float seg = 1f;
//tile collisions //tile collisions
private Rect tmp = new Rect(); private Vec2 vector = new Vec2(), l1 = new Vec2();
private Vec2 vector = new Vec2(); private Rect r1 = new Rect(), r2 = new Rect(), tmp = new Rect();
private Vec2 l1 = new Vec2();
private Rect r1 = new Rect();
private Rect r2 = new Rect();
//entity collisions //entity collisions
private Seq<Hitboxc> arrOut = new Seq<>(Hitboxc.class); private Seq<Hitboxc> arrOut = new Seq<>(Hitboxc.class);

2
core/src/mindustry/type/UnitType.java
View File

@@ -1020,7 +1020,7 @@ public class UnitType extends UnlockableContent{
//find reconstructor //find reconstructor
var rec = (Reconstructor)content.blocks().find(b -> b instanceof Reconstructor re && re.upgrades.contains(u -> u[1] == this)); var rec = (Reconstructor)content.blocks().find(b -> b instanceof Reconstructor re && re.upgrades.contains(u -> u[1] == this));
if(rec != null && Structs.find(rec.consumers, i -> i instanceof ConsumeItems) instanceof ConsumeItems ci){ if(rec != null && rec.findConsumer(i -> i instanceof ConsumeItems) instanceof ConsumeItems ci){
if(prevReturn != null){ if(prevReturn != null){
prevReturn[0] = rec.upgrades.find(u -> u[1] == this)[0]; prevReturn[0] = rec.upgrades.find(u -> u[1] == this)[0];
} }