From 1a02b91293bfda7f0d92c2fca99c56e4264979af Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sat, 11 Oct 2025 15:26:41 +0200 Subject: [PATCH] Fix cocoa beans, rename shouldSkipSaving to skipSaving in the SessionAcceptCodeOfConductEvent --- .../bedrock/SessionAcceptCodeOfConductEvent.java | 12 ++++++------ .../geysermc/geyser/util/CodeOfConductManager.java | 2 +- core/src/main/resources/mappings | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionAcceptCodeOfConductEvent.java b/api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionAcceptCodeOfConductEvent.java index cc24e5114..0df79765e 100644 --- a/api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionAcceptCodeOfConductEvent.java +++ b/api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionAcceptCodeOfConductEvent.java @@ -42,7 +42,7 @@ import org.geysermc.geyser.api.event.java.ServerCodeOfConductEvent; */ public class SessionAcceptCodeOfConductEvent extends ConnectionEvent { private final String codeOfConduct; - private boolean wasSavedElsewhere = false; + private boolean skipSaving = false; public SessionAcceptCodeOfConductEvent(@NonNull GeyserConnection connection, String codeOfConduct) { super(connection); @@ -61,15 +61,15 @@ public class SessionAcceptCodeOfConductEvent extends ConnectionEvent { * @return {@code true} if Geyser should not save the acceptance of the code of conduct in its own cache (through a JSON file), because it was saved elsewhere * @since 2.9.0 */ - public boolean wasSavedElsewhere() { - return wasSavedElsewhere; + public boolean shouldSkipSaving() { + return skipSaving; } /** - * Sets {@link SessionAcceptCodeOfConductEvent#wasSavedElsewhere()} to {@code true}. + * Sets {@link SessionAcceptCodeOfConductEvent#shouldSkipSaving()} to {@code true}. * @since 2.9.0 */ - public void savedElsewhere() { - this.wasSavedElsewhere = true; + public void skipSaving() { + this.skipSaving = true; } } diff --git a/core/src/main/java/org/geysermc/geyser/util/CodeOfConductManager.java b/core/src/main/java/org/geysermc/geyser/util/CodeOfConductManager.java index 1bf32e896..8692f35b6 100644 --- a/core/src/main/java/org/geysermc/geyser/util/CodeOfConductManager.java +++ b/core/src/main/java/org/geysermc/geyser/util/CodeOfConductManager.java @@ -81,7 +81,7 @@ public class CodeOfConductManager { public void saveCodeOfConductAccepted(GeyserSession session, String codeOfConduct) { SessionAcceptCodeOfConductEvent event = new SessionAcceptCodeOfConductEvent(session, codeOfConduct); session.getGeyser().getEventBus().fire(event); - if (!event.wasSavedElsewhere()) { + if (!event.shouldSkipSaving()) { playerAcceptedCodeOfConducts.put(session.xuid(), codeOfConduct.hashCode()); dirty = true; } diff --git a/core/src/main/resources/mappings b/core/src/main/resources/mappings index ae31e2284..9bb4fc8e1 160000 --- a/core/src/main/resources/mappings +++ b/core/src/main/resources/mappings @@ -1 +1 @@ -Subproject commit ae31e2284a89d4ae25edd8cc583ff44ddfe9670c +Subproject commit 9bb4fc8e1794cb48b61ccf8590688e71b1e629cc