Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-30 16:34:48 +02:00
Code Issues Projects Releases Wiki Activity

Made InstanceManager#unregisterInstance thread-safe

Browse Source
This commit is contained in:
themode 2020-09-27 19:04:08 +02:00
parent 670887f7b3
commit 45cc1dd2c7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/minestom/server/instance/InstanceManager.java
View File

@ -111,15 +111,17 @@ public final class InstanceManager {
public void unregisterInstance(Instance instance) {
Check.stateCondition(!instance.getPlayers().isEmpty(), "You cannot unregister an instance with players");
// Unload all chunks
if (instance instanceof InstanceContainer) {
InstanceContainer instanceContainer = (InstanceContainer) instance;
instanceContainer.scheduledChunksToRemove.addAll(instanceContainer.getChunks());
instanceContainer.UNSAFE_unloadChunks();
}
synchronized (instance) {
// Unload all chunks
if (instance instanceof InstanceContainer) {
InstanceContainer instanceContainer = (InstanceContainer) instance;
instanceContainer.scheduledChunksToRemove.addAll(instanceContainer.getChunks());
instanceContainer.UNSAFE_unloadChunks();
}
instance.setRegistered(false);
this.instances.remove(instance);
instance.setRegistered(false);
this.instances.remove(instance);
}
}
/**