From 0997c2bab60e668541e597780651f554a3bc8b06 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Tue, 24 May 2022 04:20:21 +0200 Subject: [PATCH] Disable toggles on join --- api/src/main/java/com/alttd/chat/objects/Toggleable.java | 4 ++-- .../main/java/com/alttd/chat/listeners/PlayerListener.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/com/alttd/chat/objects/Toggleable.java b/api/src/main/java/com/alttd/chat/objects/Toggleable.java index d5bc4be..1c53607 100644 --- a/api/src/main/java/com/alttd/chat/objects/Toggleable.java +++ b/api/src/main/java/com/alttd/chat/objects/Toggleable.java @@ -45,10 +45,10 @@ public abstract class Toggleable { public abstract void setOn(UUID uuid); - public void disableToggles(UUID uuid) { + public static void disableToggles(UUID uuid) { for (Toggleable toggleable : togglableClasses) { if (toggleable.isToggled(uuid)) { - setOff(uuid); + toggleable.setOff(uuid); } } } diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java index 9a98f43..02a1f97 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/PlayerListener.java @@ -5,6 +5,7 @@ import com.alttd.chat.managers.ChatUserManager; import com.alttd.chat.managers.RegexManager; import com.alttd.chat.objects.ChatUser; import com.alttd.chat.objects.ModifiableString; +import com.alttd.chat.objects.Toggleable; import com.alttd.chat.util.GalaxyUtility; import com.alttd.chat.util.Utility; import net.kyori.adventure.text.Component; @@ -23,6 +24,7 @@ public class PlayerListener implements Listener { @EventHandler private void onPlayerLogin(PlayerJoinEvent event) { UUID uuid = event.getPlayer().getUniqueId(); + Toggleable.disableToggles(uuid); ChatUser user = ChatUserManager.getChatUser(uuid); if(user != null) return;