Merge remote-tracking branch 'origin/master'

BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java

@@ -139,8 +139,12 @@ public class SimulatorStorage implements Enable, Disable {
             }
             if (file.getName().endsWith(".yapion")) {
                 String name = file.getName().substring(0, file.getName().length() - 7);
-                SteamwarUser steamwarUser = SteamwarUser.get(Integer.parseInt(name));
+                try {
-                convert(file, steamwarUser);
+                    SteamwarUser steamwarUser = SteamwarUser.get(Integer.parseInt(name));
+                    convert(file, steamwarUser);
+                } catch (Exception e) {
+                    file.delete();
+                }
             } else {
                 String name = file.getName().substring(0, file.getName().length() - ".simulator".length());
                 tntSimulators.put(name, new TNTSimulator(yapionObject));