Some fixs

2015-01-03 23:40:45 +01:00
parent 2d148860d5
commit fba07fa7e5
2 changed files with 35 additions and 26 deletions
@@ -45,8 +45,11 @@ public class TimeoutTask implements Runnable {
                    }
                }
                GameMode gm = AuthMePlayerListener.gameMode.get(name);
-                player.setGameMode(gm);
-                ConsoleLogger.info("Set " + player.getName() + " to gamemode: " + gm.name());
+                if (gm != null)
+                {
+                	player.setGameMode(gm);
+                	ConsoleLogger.info("Set " + player.getName() + " to gamemode: " + gm.name());
+                }
                player.kickPlayer(m._("timeout")[0]);
                break;
            }