Fixed #2425 (probably)

This commit is contained in:
Anuken
2020-08-25 23:14:11 -04:00
parent 71b55317c1
commit 1461673168
4 changed files with 10 additions and 4 deletions

View File

@@ -389,7 +389,7 @@ public class UnitTypes implements ContentList{
legLength = 30f; legLength = 30f;
legExtension = -15; legExtension = -15;
legBaseOffset = 10f; legBaseOffset = 10f;
landShake = 2f; landShake = 1f;
legSpeed = 0.1f; legSpeed = 0.1f;
legLengthScl = 1f; legLengthScl = 1f;
rippleScale = 2f; rippleScale = 2f;

View File

@@ -275,10 +275,10 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
damageContinuous(floor.damageTaken); damageContinuous(floor.damageTaken);
} }
if(!net.client() && tile.solid()){ if(tile.solid()){
if(type.canBoost){ if(type.canBoost){
elevation = 1f; elevation = 1f;
}else{ }else if(!net.client()){
kill(); kill();
} }
} }

View File

@@ -566,6 +566,8 @@ public class DesktopInput extends InputHandler{
@Override @Override
public void updateState(){ public void updateState(){
super.updateState();
if(state.isMenu()){ if(state.isMenu()){
droppingItem = false; droppingItem = false;
mode = none; mode = none;

View File

@@ -236,6 +236,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
player.clearUnit(); player.clearUnit();
player.deathTimer = 61f; player.deathTimer = 61f;
((CoreBuild)((BlockUnitc)unit).tile()).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();
//make sure it's AI controlled, so players can't overwrite each other //make sure it's AI controlled, so players can't overwrite each other
@@ -372,7 +374,9 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
} }
public void updateState(){ public void updateState(){
if(state.isMenu()){
controlledType = null;
}
} }
public void drawBottom(){ public void drawBottom(){