From 555951f10742c44168dc7f331d19734cea5bb108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Dufrene?= <43671109+itsme-to@users.noreply.github.com> Date: Sat, 7 Mar 2026 14:30:40 +0100 Subject: [PATCH 1/2] Add MiniMessage support for thunder enabled / disabled --- .../com/earth2me/essentials/commands/Commandthunder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandthunder.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandthunder.java index ce678d0540a..5825127a227 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandthunder.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandthunder.java @@ -1,6 +1,7 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.User; +import com.earth2me.essentials.adventure.AdventureUtil; import com.google.common.collect.Lists; import org.bukkit.Server; import org.bukkit.World; @@ -21,15 +22,17 @@ public void run(final Server server, final User user, final String commandLabel, final World world = user.getWorld(); final boolean setThunder = args[0].equalsIgnoreCase("true"); + final String status = setThunder ? user.playerTl("enabled") : user.playerTl("disabled"); + if (args.length == 1) { world.setThundering(setThunder); - user.sendTl("thunder", setThunder ? user.playerTl("enabled") : user.playerTl("disabled")); + user.sendTl("thunder", AdventureUtil.parsed(status)); return; } world.setThundering(setThunder); world.setThunderDuration(Integer.parseInt(args[1]) * 20); - user.sendTl("thunderDuration", setThunder ? user.playerTl("enabled") : user.playerTl("disabled"), Integer.parseInt(args[1])); + user.sendTl("thunderDuration", AdventureUtil.parsed(status), Integer.parseInt(args[1])); } @Override From 8e6937b8ccbd74399362d40dc9f822fbd63dca51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Dufrene?= <43671109+itsme-to@users.noreply.github.com> Date: Mon, 9 Mar 2026 16:00:36 +0100 Subject: [PATCH 2/2] Use CommonPlaceholders --- .../com/earth2me/essentials/commands/Commandthunder.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandthunder.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandthunder.java index 5825127a227..09a93328d11 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandthunder.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandthunder.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.User; -import com.earth2me.essentials.adventure.AdventureUtil; +import com.earth2me.essentials.utils.CommonPlaceholders; import com.google.common.collect.Lists; import org.bukkit.Server; import org.bukkit.World; @@ -22,17 +22,16 @@ public void run(final Server server, final User user, final String commandLabel, final World world = user.getWorld(); final boolean setThunder = args[0].equalsIgnoreCase("true"); - final String status = setThunder ? user.playerTl("enabled") : user.playerTl("disabled"); if (args.length == 1) { world.setThundering(setThunder); - user.sendTl("thunder", AdventureUtil.parsed(status)); + user.sendTl("thunder", CommonPlaceholders.enableDisable(user.getSource(), setThunder)); return; } world.setThundering(setThunder); world.setThunderDuration(Integer.parseInt(args[1]) * 20); - user.sendTl("thunderDuration", AdventureUtil.parsed(status), Integer.parseInt(args[1])); + user.sendTl("thunderDuration", CommonPlaceholders.enableDisable(user.getSource(), setThunder), Integer.parseInt(args[1])); } @Override