OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-12-23 06:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't attempt to clear registry that hasn't been loaded yet (#5101)

Browse source
This commit is contained in:
chris 2024-10-25 00:55:19 +08:00 committed by GitHub
parent e7ecb55f33
commit 29fe033257
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/org/geysermc/geyser/GeyserImpl.java
View file

@ -723,7 +723,9 @@ public class GeyserImpl implements GeyserApi, EventRegistrar {
runIfNonNull(newsHandler, NewsHandler::shutdown); runIfNonNull(newsHandler, NewsHandler::shutdown);
runIfNonNull(erosionUnixListener, UnixSocketClientListener::close); runIfNonNull(erosionUnixListener, UnixSocketClientListener::close);
Registries.RESOURCE_PACKS.get().clear(); if (Registries.RESOURCE_PACKS.loaded()) {
Registries.RESOURCE_PACKS.get().clear();
}
this.setEnabled(false); this.setEnabled(false);
} }

7
core/src/main/java/org/geysermc/geyser/registry/DeferredRegistry.java
View file

@ -112,6 +112,13 @@ public final class DeferredRegistry<M> implements IRegistry<M> {
this.loaded = true; this.loaded = true;
} }
/**
* Whether this registry was loaded.
*/
public boolean loaded() {
return this.loaded;
}
/** /**
* Creates a new deferred registry. * Creates a new deferred registry.
* *