diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index 4ebc918347..709da87626 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -588,7 +588,7 @@ public class MobileInput extends InputHandler implements GestureListener{ public void update(){ super.update(); - if(state.isMenu() ){ + if(state.isMenu()){ selectRequests.clear(); removals.clear(); mode = none; diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 0c3b64f512..7615513ca5 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -139,6 +139,9 @@ public class Administration{ /** @return whether this action is allowed by the action filters. */ public boolean allowAction(Player player, ActionType type, Tile tile, Cons setter){ + //some actions are done by the server (null player) and thus are always alloed + if(player == null) return true; + PlayerAction act = Pools.obtain(PlayerAction.class, PlayerAction::new); setter.get(act.set(player, type, tile)); for(ActionFilter filter : actionFilters){