Merge remote-tracking branch 'origin/master'

2016-05-27 23:05:40 +02:00
parent cb10854612 466fb8cab9
commit 107441746e
2 changed files with 69 additions and 67 deletions
@@ -89,7 +89,12 @@ public class AsynchronousJoin implements AsynchronousProcess {

        if (service.getProperty(RestrictionSettings.FORCE_SURVIVAL_MODE)
            && !service.hasPermission(player, PlayerStatePermission.BYPASS_FORCE_SURVIVAL)) {
-            player.setGameMode(GameMode.SURVIVAL);
+            bukkitService.runTask(new Runnable() {
+                @Override
+                public void run() {
+                    player.setGameMode(GameMode.SURVIVAL);
+                }
+            });
        }

        if (service.getProperty(HooksSettings.DISABLE_SOCIAL_SPY)) {