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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-01-17 15:54:49 -05:00
parent 6a63956b71 32a1d91faf
commit ffad9cb9a9
1 changed files with 2 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

@@ -343,7 +343,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
} }
player.clearUnit(); player.clearUnit();
player.deathTimer = 61f; player.deathTimer = Player.deathDelay + 1f;
build.requestSpawn(player); build.requestSpawn(player);
}else if(unit == null){ //just clear the unit (is this used?) }else if(unit == null){ //just clear the unit (is this used?)
player.clearUnit(); player.clearUnit();
@@ -369,7 +369,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
Fx.spawn.at(player); Fx.spawn.at(player);
player.clearUnit(); player.clearUnit();
player.deathTimer = 61f; //for instant respawn player.deathTimer = Player.deathDelay + 1f; //for instant respawn
} }
@Remote(targets = Loc.both, called = Loc.server, forward = true) @Remote(targets = Loc.both, called = Loc.server, forward = true)