GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix reload command (fixes #2255)

Browse source
This commit is contained in:
Camotoy 2021-06-06 10:19:24 -04:00
parent aec27f8481
commit b2ebfc6803
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
connector/src/main/java/org/geysermc/connector/GeyserConnector.java
View file

@ -391,7 +391,9 @@ public class GeyserConnector {
generalThreadPool.shutdown(); generalThreadPool.shutdown();
bedrockServer.close(); bedrockServer.close();
timeSyncer.shutdown(); if (timeSyncer != null) {
timeSyncer.shutdown();
}
newsHandler.shutdown(); newsHandler.shutdown();
players.clear(); players.clear();
defaultAuthType = null; defaultAuthType = null;

6
connector/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java
View file

@ -32,6 +32,8 @@ import org.geysermc.connector.command.GeyserCommand;
import org.geysermc.connector.network.session.GeyserSession; import org.geysermc.connector.network.session.GeyserSession;
import org.geysermc.connector.utils.LanguageUtils; import org.geysermc.connector.utils.LanguageUtils;
import java.util.ArrayList;
public class ReloadCommand extends GeyserCommand { public class ReloadCommand extends GeyserCommand {
private final GeyserConnector connector; private final GeyserConnector connector;
@ -51,8 +53,8 @@ public class ReloadCommand extends GeyserCommand {
sender.sendMessage(message); sender.sendMessage(message);
for (GeyserSession otherSession : connector.getPlayers()) { for (GeyserSession otherSession : new ArrayList<>(connector.getPlayers())) {
otherSession.disconnect(LanguageUtils.getPlayerLocaleString("geyser.commands.reload.kick", session.getLocale())); otherSession.disconnect(LanguageUtils.getPlayerLocaleString("geyser.commands.reload.kick", otherSession.getLocale()));
} }
connector.reload(); connector.reload();
} }