mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-28 07:22:21 -08:00
Code Issues Projects Releases Wiki Activity

Fixed #6782 / Fixed #6781 / Fixed #6779

Browse source
This commit is contained in:
Anuken 2022-05-08 09:23:43 -04:00
parent aaccb36d93
commit e94e31aedf
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/mindustry/input/InputHandler.java
View file

@ -590,6 +590,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
logicCutsceneZoom = -1f;
}
if(!commandMode){
commandRect = false;
}
playerPlanTree.clear();
player.unit().plans.each(playerPlanTree::insert);

4
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View file

@ -183,12 +183,12 @@ public class Turret extends ReloadTurret{
public float estimateDps(){
if(!hasAmmo()) return 0f;
return shoot.shots / reload * 60f * peekAmmo().estimateDPS() * potentialEfficiency * timeScale;
return shoot.shots / reload * 60f * (peekAmmo() == null ? 0f : peekAmmo().estimateDPS()) * potentialEfficiency * timeScale;
}
@Override
public float range(){
if(hasAmmo()){
if(peekAmmo() != null){
return range + peekAmmo().rangeChange;
}
return range;

2
core/src/mindustry/world/blocks/production/BeamDrill.java
View file

@ -281,6 +281,8 @@ public class BeamDrill extends Block{
Draw.rect(block.region, x, y);
Draw.rect(topRegion, x, y, rotdeg());
if(isPayload()) return;
var dir = Geometry.d4(rotation);
int ddx = Geometry.d4x(rotation + 1), ddy = Geometry.d4y(rotation + 1);