GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Fix potential issue with the settings form - coordinate showing might change while we are in the settings menu (#4324)

This commit is contained in:
chris 2023-12-04 01:44:06 +01:00 committed by GitHub
parent b8481cc3cd
commit 308f293021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/main/java/org/geysermc/geyser/util/SettingsUtils.java
View File

@ -49,28 +49,32 @@ public class SettingsUtils {
.title("geyser.settings.title.main") .title("geyser.settings.title.main")
.iconPath("textures/ui/settings_glyph_color_2x.png"); .iconPath("textures/ui/settings_glyph_color_2x.png");
// Let's store these to avoid issues
boolean showCoordinates = session.getPreferencesCache().isAllowShowCoordinates();
boolean cooldownShown = CooldownUtils.getDefaultShowCooldown() != CooldownUtils.CooldownType.DISABLED;
boolean customSkulls = session.getGeyser().getConfig().isAllowCustomSkulls();
// Only show the client title if any of the client settings are available // Only show the client title if any of the client settings are available
boolean showClientSettings = session.getPreferencesCache().isAllowShowCoordinates() boolean showClientSettings = showCoordinates || cooldownShown || customSkulls;
|| CooldownUtils.getDefaultShowCooldown() != CooldownUtils.CooldownType.DISABLED
|| session.getGeyser().getConfig().isAllowCustomSkulls();
if (showClientSettings) { if (showClientSettings) {
builder.label("geyser.settings.title.client"); builder.label("geyser.settings.title.client");
// Client can only see its coordinates if reducedDebugInfo is disabled and coordinates are enabled in geyser config. // Client can only see its coordinates if reducedDebugInfo is disabled and coordinates are enabled in geyser config.
if (session.getPreferencesCache().isAllowShowCoordinates()) { if (showCoordinates) {
builder.toggle("%createWorldScreen.showCoordinates", session.getPreferencesCache().isPrefersShowCoordinates()); builder.toggle("%createWorldScreen.showCoordinates", session.getPreferencesCache().isPrefersShowCoordinates());
} }
if (CooldownUtils.getDefaultShowCooldown() != CooldownUtils.CooldownType.DISABLED) { if (cooldownShown) {
DropdownComponent.Builder cooldownDropdown = DropdownComponent.builder("options.attackIndicator"); DropdownComponent.Builder cooldownDropdown = DropdownComponent.builder("options.attackIndicator");
cooldownDropdown.option("options.attack.crosshair", session.getPreferencesCache().getCooldownPreference() == CooldownUtils.CooldownType.TITLE); CooldownUtils.CooldownType currentCooldownType = session.getPreferencesCache().getCooldownPreference();
cooldownDropdown.option("options.attack.hotbar", session.getPreferencesCache().getCooldownPreference() == CooldownUtils.CooldownType.ACTIONBAR); cooldownDropdown.option("options.attack.crosshair", currentCooldownType == CooldownUtils.CooldownType.TITLE);
cooldownDropdown.option("options.off", session.getPreferencesCache().getCooldownPreference() == CooldownUtils.CooldownType.DISABLED); cooldownDropdown.option("options.attack.hotbar", currentCooldownType == CooldownUtils.CooldownType.ACTIONBAR);
cooldownDropdown.option("options.off", currentCooldownType == CooldownUtils.CooldownType.DISABLED);
builder.dropdown(cooldownDropdown); builder.dropdown(cooldownDropdown);
} }
if (session.getGeyser().getConfig().isAllowCustomSkulls()) { if (customSkulls) {
builder.toggle("geyser.settings.option.customSkulls", session.getPreferencesCache().isPrefersCustomSkulls()); builder.toggle("geyser.settings.option.customSkulls", session.getPreferencesCache().isPrefersCustomSkulls());
} }
} }
@ -94,17 +98,21 @@ public class SettingsUtils {
builder.validResultHandler((response) -> { builder.validResultHandler((response) -> {
if (showClientSettings) { if (showClientSettings) {
// Client can only see its coordinates if reducedDebugInfo is disabled and coordinates are enabled in geyser config. // Client can only see its coordinates if reducedDebugInfo is disabled and coordinates are enabled in geyser config.
if (session.getPreferencesCache().isAllowShowCoordinates()) { if (showCoordinates) {
session.getPreferencesCache().setPrefersShowCoordinates(response.next()); // In theory, a server could update the gamerule while the client is in the settings menu.
session.getPreferencesCache().updateShowCoordinates(); // We need to still read the response to update the client's preference, but we don't want to update the gamerule.
if (session.getPreferencesCache().isAllowShowCoordinates()) {
session.getPreferencesCache().setPrefersShowCoordinates(response.next());
session.getPreferencesCache().updateShowCoordinates();
}
} }
if (CooldownUtils.getDefaultShowCooldown() != CooldownUtils.CooldownType.DISABLED) { if (cooldownShown) {
CooldownUtils.CooldownType cooldownType = CooldownUtils.CooldownType.VALUES[(int) response.next()]; CooldownUtils.CooldownType cooldownType = CooldownUtils.CooldownType.VALUES[(int) response.next()];
session.getPreferencesCache().setCooldownPreference(cooldownType); session.getPreferencesCache().setCooldownPreference(cooldownType);
} }
if (session.getGeyser().getConfig().isAllowCustomSkulls()) { if (customSkulls) {
session.getPreferencesCache().setPrefersCustomSkulls(response.next()); session.getPreferencesCache().setPrefersCustomSkulls(response.next());
} }
} }