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

Fixed some possible crashes

Browse Source
This commit is contained in:
Anuken
2023-04-03 16:40:12 -04:00
parent 6d71bcd2eb
commit e62a5888ef
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/ai/types/BuilderAI.java
View File

@@ -19,7 +19,7 @@ public class BuilderAI extends AIController{
public @Nullable Teamc enemy;
public @Nullable BlockPlan lastPlan;
public float fleeRange = 370f;
public float fleeRange = 370f, rebuildPeriod = 60f * 2f;
public boolean alwaysFlee;
public boolean onlyAssist;
@@ -158,10 +158,8 @@ public class BuilderAI extends AIController{
}
}
float rebuildTime = 2f * 60f;
//find new plan
if(!onlyAssist && !unit.team.data().plans.isEmpty() && following == null && timer.get(timerTarget3, rebuildTime)){
if(!onlyAssist && !unit.team.data().plans.isEmpty() && following == null && timer.get(timerTarget3, rebuildPeriod)){
Queue<BlockPlan> blocks = unit.team.data().plans;
BlockPlan block = blocks.first();

4
core/src/mindustry/type/Weapon.java
View File

@@ -221,7 +221,7 @@ public class Weapon implements Cloneable{
for(int i = 0; i < parts.size; i++){
var part = parts.get(i);
DrawPart.params.setRecoil(part.recoilIndex >= 0 ? mount.recoils[part.recoilIndex] : mount.recoil);
DrawPart.params.setRecoil(part.recoilIndex >= 0 && mount.recoils != null ? mount.recoils[part.recoilIndex] : mount.recoil);
if(part.under){
part.draw(DrawPart.params);
}
@@ -253,7 +253,7 @@ public class Weapon implements Cloneable{
//TODO does it need an outline?
for(int i = 0; i < parts.size; i++){
var part = parts.get(i);
DrawPart.params.setRecoil(part.recoilIndex >= 0 ? mount.recoils[part.recoilIndex] : mount.recoil);
DrawPart.params.setRecoil(part.recoilIndex >= 0 && mount.recoils != null ? mount.recoils[part.recoilIndex] : mount.recoil);
if(!part.under){
part.draw(DrawPart.params);
}

2
core/src/mindustry/world/draw/DrawTurret.java
View File

@@ -75,7 +75,7 @@ public class DrawTurret extends DrawBlock{
var params = DrawPart.params.set(build.warmup(), 1f - progress, 1f - progress, tb.heat, tb.curRecoil, tb.charge, tb.x + tb.recoilOffset.x, tb.y + tb.recoilOffset.y, tb.rotation);
for(var part : parts){
params.setRecoil(part.recoilIndex >= 0 ? tb.curRecoils[part.recoilIndex] : tb.curRecoil);
params.setRecoil(part.recoilIndex >= 0 && tb.curRecoils != null ? tb.curRecoils[part.recoilIndex] : tb.curRecoil);
part.draw(params);
}
}