Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-02 03:00:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #12410

Browse Source
This commit is contained in:
Anuken
2026-07-24 13:30:29 -04:00
parent 729a4f50ba
commit 62b8bdd7e3
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/core/NetServer.java
+1 -1
View File
@@ -808,7 +808,7 @@ public class NetServer implements ApplicationListener{
if(!player.dead()){
unit.controlWeapons(shooting, shooting);
unit.aim(pointerX, pointerY);
unit.aim(pointerX, pointerY, true);
unit.mineTile = mining;
long elapsed = Math.min(Time.timeSinceMillis(con.lastReceivedClientTime), 1500);
core/src/mindustry/entities/comp/WeaponsComp.java
+6
View File
@@ -53,6 +53,11 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
/** Aim at something. This will make all mounts point at it. */
void aim(float x, float y){
aim(x, y, false);
}
/** Aim at something. This will make all mounts point at it. */
void aim(float x, float y, boolean clearTarget){
Tmp.v1.set(x, y).sub(this.x, this.y);
if(Tmp.v1.len() < type.aimDst) Tmp.v1.setLength(type.aimDst);
@@ -61,6 +66,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
for(WeaponMount mount : mounts){
if(mount.weapon.controllable){
if(clearTarget) mount.target = null;
mount.aimX = x;
mount.aimY = y;
}
core/src/mindustry/input/DesktopInput.java
+1 -1
View File
@@ -1003,7 +1003,7 @@ public class DesktopInput extends InputHandler{
unit.movePref(movement);
unit.aim(Core.input.mouseWorld());
unit.aim(input.mouseWorldX(), input.mouseWorldY(), true);
unit.controlWeapons(true, player.shooting && !boosted);
player.boosting = Core.input.keyDown(Binding.boost);
core/src/mindustry/input/MobileInput.java
+3 -3
View File
@@ -1084,7 +1084,7 @@ public class MobileInput extends InputHandler implements GestureListener{
//autofire targeting
if(manualShooting){
player.shooting = !boosted;
unit.aim(player.mouseX = Core.input.mouseWorldX(), player.mouseY = Core.input.mouseWorldY());
unit.aim(player.mouseX = Core.input.mouseWorldX(), player.mouseY = Core.input.mouseWorldY(), true);
}else if(target == null){
player.shooting = false;
if(Core.settings.getBool("autotarget") && !(player.unit() instanceof BlockUnitUnit u && u.tile() instanceof ControlBlock c && !c.shouldAutoTarget())){
@@ -1102,7 +1102,7 @@ public class MobileInput extends InputHandler implements GestureListener{
//when not shooting, aim at mouse cursor
//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());
unit.aim(Core.input.mouseWorldX(), Core.input.mouseWorldY(), true);
}else{
Vec2 intercept = player.unit().type.weapons.contains(w -> w.predictTarget) ? Predict.intercept(unit, target, type.weapons.first().bullet) : Tmp.v1.set(target);
@@ -1110,7 +1110,7 @@ public class MobileInput extends InputHandler implements GestureListener{
player.mouseY = intercept.y;
player.shooting = !boosted;
unit.aim(player.mouseX, player.mouseY);
unit.aim(player.mouseX, player.mouseY, true);
}
}