Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-10-06 21:07:25 +03:00
Code Issues Projects Releases Wiki Activity

oh no

Browse Source
This commit is contained in:
Anuken 2022-07-08 17:54:05 -04:00
parent 3da0486320
commit 8b0a86e883
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/content/Blocks.java
View File

@ -4701,6 +4701,7 @@ public class Blocks{
limitRange(); limitRange();
}}; }};
if(false)
divine = new PowerTurret("divine"){{ divine = new PowerTurret("divine"){{
requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 150, Items.graphite, 250, Items.phaseFabric, 300)); requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 150, Items.graphite, 250, Items.phaseFabric, 300));

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

@ -237,7 +237,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
} }
} }
if(unitIds.length > 0 && player == Vars.player){ if(unitIds.length > 0 && player == Vars.player && !state.isPaused()){
if(teamTarget != null){ if(teamTarget != null){
Fx.attackCommand.at(teamTarget); Fx.attackCommand.at(teamTarget);
}else{ }else{
@ -257,8 +257,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
} }
build.onCommand(target); build.onCommand(target);
if(!state.isPaused() && player == Vars.player){
Fx.moveCommand.at(target); Fx.moveCommand.at(target);
} }
}
@Remote(called = Loc.server, targets = Loc.both, forward = true) @Remote(called = Loc.server, targets = Loc.both, forward = true)
public static void requestItem(Player player, Building build, Item item, int amount){ public static void requestItem(Player player, Building build, Item item, int amount){