OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-11-29 03:32:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't send softEnumPackets when command suggestions are false (#4037)

Browse source 
* Don't send SoftEnums if command suggestions are set to false, add system property to not send team suggestions

* address review
This commit is contained in:
chris 2023-08-07 02:39:27 +02:00 committed by GitHub
parent b1f04a9012
commit 2361f587da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/org/geysermc/geyser/scoreboard/Scoreboard.java
View file

@ -52,6 +52,7 @@ import static org.geysermc.geyser.scoreboard.UpdateType.*;
public final class Scoreboard { public final class Scoreboard {
private static final boolean SHOW_SCOREBOARD_LOGS = Boolean.parseBoolean(System.getProperty("Geyser.ShowScoreboardLogs", "true")); private static final boolean SHOW_SCOREBOARD_LOGS = Boolean.parseBoolean(System.getProperty("Geyser.ShowScoreboardLogs", "true"));
private static final boolean ADD_TEAM_SUGGESTIONS = Boolean.parseBoolean(System.getProperty("Geyser.AddTeamSuggestions", "true"));
private final GeyserSession session; private final GeyserSession session;
private final GeyserLogger logger; private final GeyserLogger logger;
@ -150,8 +151,9 @@ public final class Scoreboard {
teams.put(teamName, team); teams.put(teamName, team);
// Update command parameters - is safe to send even if the command enum doesn't exist on the client (as of 1.19.51) // Update command parameters - is safe to send even if the command enum doesn't exist on the client (as of 1.19.51)
session.addCommandEnum("Geyser_Teams", team.getId()); if (ADD_TEAM_SUGGESTIONS) {
session.addCommandEnum("Geyser_Teams", team.getId());
}
return team; return team;
} }

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

@ -2008,6 +2008,10 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
} }
private void softEnumPacket(String name, SoftEnumUpdateType type, String enums) { private void softEnumPacket(String name, SoftEnumUpdateType type, String enums) {
// There is no need to send command enums if command suggestions are disabled
if (!this.geyser.getConfig().isCommandSuggestions()) {
return;
}
UpdateSoftEnumPacket packet = new UpdateSoftEnumPacket(); UpdateSoftEnumPacket packet = new UpdateSoftEnumPacket();
packet.setType(type); packet.setType(type);
packet.setSoftEnum(new CommandEnumData(name, Collections.singletonMap(enums, Collections.emptySet()), true)); packet.setSoftEnum(new CommandEnumData(name, Collections.singletonMap(enums, Collections.emptySet()), true));