From a92294574b3e807eaf480bffbc2a1572b8d4b384 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Thu, 13 Jan 2022 23:51:26 +0100 Subject: [PATCH] Disable particles if player turns them off Don't let player turn on particles without seeing them --- .../com/alttd/gui/actions/ToggleParticlesActive.java | 7 +++++++ .../java/com/alttd/gui/actions/ToggleSeeParticles.java | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/alttd/gui/actions/ToggleParticlesActive.java b/src/main/java/com/alttd/gui/actions/ToggleParticlesActive.java index 37d202b..35b46ee 100644 --- a/src/main/java/com/alttd/gui/actions/ToggleParticlesActive.java +++ b/src/main/java/com/alttd/gui/actions/ToggleParticlesActive.java @@ -21,5 +21,12 @@ public class ToggleParticlesActive implements GUIAction { boolean result = playerSettings.toggleParticlesActive(); openParticleGUI.updateSettingSlots(playerSettings); Queries.setParticlesActive(player.getUniqueId(), result); + if (!result || playerSettings.isSeeingParticles()) { + openParticleGUI.updateSettingSlots(playerSettings); + return; + } + boolean result2 = playerSettings.toggleSeeingParticles(); + openParticleGUI.updateSettingSlots(playerSettings); + Queries.setParticlesActive(player.getUniqueId(), result2); } } diff --git a/src/main/java/com/alttd/gui/actions/ToggleSeeParticles.java b/src/main/java/com/alttd/gui/actions/ToggleSeeParticles.java index d52a298..5dd218e 100644 --- a/src/main/java/com/alttd/gui/actions/ToggleSeeParticles.java +++ b/src/main/java/com/alttd/gui/actions/ToggleSeeParticles.java @@ -19,7 +19,15 @@ public class ToggleSeeParticles implements GUIAction { @Override public void click(Player player) { boolean result = playerSettings.toggleSeeingParticles(); - openParticleGUI.updateSettingSlots(playerSettings); Queries.setSeeingParticles(player.getUniqueId(), result); + + if (result || !playerSettings.hasActiveParticles()) { + openParticleGUI.updateSettingSlots(playerSettings); + return; + } + + boolean result2 = playerSettings.toggleParticlesActive(); + openParticleGUI.updateSettingSlots(playerSettings); + Queries.setParticlesActive(player.getUniqueId(), result2); } }