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

More achievement cleanup

Browse Source
This commit is contained in:
Anuken
2020-11-04 12:45:51 -05:00
parent caec96615f
commit e8a5e35f50
11 changed files with 161 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,7 +326,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
//clear player unit when they possess a core
if((unit instanceof BlockUnitc && ((BlockUnitc)unit).tile() instanceof CoreBuild)){
if(unit instanceof BlockUnitc block && block.tile() instanceof CoreBuild build){
Fx.spawn.at(player);
if(net.client()){
control.input.controlledType = null;
@@ -334,8 +334,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
player.clearUnit();
player.deathTimer = 61f;
((CoreBuild)((BlockUnitc)unit).tile()).requestSpawn(player);
build.requestSpawn(player);
}else if(unit == null){ //just clear the unit (is this used?)
player.clearUnit();
//make sure it's AI controlled, so players can't overwrite each other
@@ -349,6 +348,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
Fx.unitSpirit.at(player.x, player.y, 0f, unit);
}
}
Events.fire(new UnitControlEvent(player, unit));
}
@Remote(targets = Loc.both, called = Loc.both, forward = true)
@@ -543,6 +544,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
schematics.add(lastSchematic);
ui.showInfoFade("@schematic.saved");
ui.schematics.showInfo(lastSchematic);
Events.fire(new SchematicCreateEvent(lastSchematic));
}
});
}