Move logic from last patch into correct place

This commit is contained in:
Shane Freeder 2021-01-13 21:31:51 +00:00
parent ccd254077b
commit 8bd708eac7

View file

@ -157,6 +157,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ Thread.sleep(1); + Thread.sleep(1);
+ } catch (InterruptedException e) {} + } catch (InterruptedException e) {}
+ } + }
+ // We've just obliterated the main thread, this will prevent stop from dying when removing players
+ MinecraftServer.getServer().getWorlds().forEach(world -> {
+ world.tickingEntities = false;
+ });
+ } + }
+ // Paper end + // Paper end
// CraftBukkit end // CraftBukkit end
@ -575,10 +579,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ e.printStackTrace(); + e.printStackTrace();
+ } + }
+ if (!server.hasStopped()) { + if (!server.hasStopped()) {
+ // We've just obliterated the main thread, this will prevent stop from dying when removing players
+ MinecraftServer.getServer().getWorlds().forEach(world -> {
+ world.tickingEntities = false;
+ });
+ server.close(); + server.close();
+ } + }
} }