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

Fixed #10962

Browse source
This commit is contained in:
Anuken 2025-06-23 12:19:13 -04:00
parent d6ee68a371
commit b3cdec91b8
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,7 +98,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}else{
Building tile = world.buildWorld(x, y);
if((tile != null && player.team() != tile.team && (tile.team != Team.derelict || state.rules.coreCapture)) || (tile != null && player.unit().type.canHeal && tile.team == player.team() && tile.damaged())){
if((tile != null && (player.team() != tile.team && (tile.team != Team.derelict || state.rules.coreCapture)) && player.unit().type.canAttack) || (tile != null && player.unit().type.canHeal && tile.team == player.team() && tile.damaged())){
player.unit().mineTile = null;
target = tile;
}
@ -1078,7 +1078,7 @@ public class MobileInput extends InputHandler implements GestureListener{
//this may be a bad idea, aiming for a point far in front could work better, test it out
unit.aim(Core.input.mouseWorldX(), Core.input.mouseWorldY());
}else{
Vec2 intercept = Predict.intercept(unit, target, bulletSpeed);
Vec2 intercept = player.unit().type.weapons.contains(w -> w.predictTarget) ? Predict.intercept(unit, target, bulletSpeed) : Tmp.v1.set(target);
player.mouseX = intercept.x;
player.mouseY = intercept.y;

8
core/src/mindustry/world/blocks/payloads/PayloadConveyor.java
View file

@ -48,12 +48,12 @@ public class PayloadConveyor extends Block{
public void drawPlace(int x, int y, int rotation, boolean valid){
super.drawPlace(x, y, rotation, valid);
int ntrns = 1 + size/2;
int ntrns = size;
for(int i = 0; i < 4; i++){
Building other = world.build(x + Geometry.d4x[i] * ntrns, y + Geometry.d4y[i] * ntrns);
if(other != null && other.block.outputsPayload && other.block.size == size){
Drawf.selected(other.tileX(), other.tileY(), other.block, other.team.color);
Tile tile = world.tile(x + Geometry.d4x[i] * ntrns, y + Geometry.d4y[i] * ntrns);
if(tile != null && tile.build != null && tile.isCenter() && tile.build.block.outputsPayload && tile.build.block.size == size && (i == rotation || tile.block().rotate && i == (tile.build.rotation + 2) % 4)){
Drawf.selected(tile.x, tile.y, tile.block(), tile.build.team.color);
}
}
}