Fixed #2582
This commit is contained in:
@@ -41,6 +41,9 @@ public class GameState{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void set(State astate){
|
public void set(State astate){
|
||||||
|
//cannot pause when in multiplayer
|
||||||
|
if(astate == State.paused && net.active()) return;
|
||||||
|
|
||||||
Events.fire(new StateChangeEvent(state, astate));
|
Events.fire(new StateChangeEvent(state, astate));
|
||||||
state = astate;
|
state = astate;
|
||||||
}
|
}
|
||||||
@@ -68,7 +71,7 @@ public class GameState{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean isPlaying(){
|
public boolean isPlaying(){
|
||||||
return state == State.playing;
|
return (state == State.playing) || (state == State.paused && !isPaused());
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @return whether the current state is *not* the menu. */
|
/** @return whether the current state is *not* the menu. */
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ public class LaunchPad extends Block{
|
|||||||
return Core.bundle.format("launch.destination",
|
return Core.bundle.format("launch.destination",
|
||||||
dest == null ? Core.bundle.get("sectors.nonelaunch") :
|
dest == null ? Core.bundle.get("sectors.nonelaunch") :
|
||||||
"[accent]" + dest.name());
|
"[accent]" + dest.name());
|
||||||
}).pad(4);
|
}).pad(4).wrap().width(200f).left();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user