Update Upstream EssentialsX:

EssentialsX@19f7e99 Add support for LuckPerms group names (EssentialsX#6229)
EssentialsX@efbcfb3 AntiBuild: Properly handle shear interactions (EssentialsX#6262)
EssentialsX@427f60e Fix matching players with similar names (EssentialsX#6263)
EssentialsX@364c879 Add @s and @p selector support (EssentialsX#6110)
EssentialsX@e086064 Adds support for armor trims inside kits (EssentialsX#6155)
EssentialsX@ca07b53 Add message when discord bot is missing permissions (EssentialsX#6228)
EssentialsX@0aa25c8 Fix issue with 'Fix issue with offline player data' (EssentialsX#6286)

Author: Euphillya

Essentials

@@ -1,6 +1,6 @@
-From 76f4e09fa5e0633317c07258297d4699219f981f Mon Sep 17 00:00:00 2001
+From a200e36fdc309a49e24ea40e6ae6116f50369ac3 Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <[email protected]>
-Date: Wed, 6 Aug 2025 15:10:00 +0200
+Date: Mon, 8 Sep 2025 06:57:02 +0200
 Subject: [PATCH 01/12] Rebrand
 
 ---
@@ -18,7 +18,7 @@ Subject: [PATCH 01/12] Rebrand
  11 files changed, 113 insertions(+), 103 deletions(-)
 
 diff --git a/Essentials/src/main/resources/plugin.yml b/Essentials/src/main/resources/plugin.yml
-index 5ae740a88..5b6456037 100644
+index 844f92319..6081ddfc6 100644
 --- a/Essentials/src/main/resources/plugin.yml
 +++ b/Essentials/src/main/resources/plugin.yml
 @@ -7,6 +7,7 @@ description: Provides an essential, core set of commands for Bukkit.

patches/plugins/0001-Rebrand.patch

@@ -1,6 +1,6 @@
-From 6b8f09f721e19177a1ba176e51d6df9e0a799948 Mon Sep 17 00:00:00 2001
+From cb624c61d68749ddab70185c05820800864264bd Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <[email protected]>
-Date: Wed, 6 Aug 2025 15:10:00 +0200
+Date: Mon, 8 Sep 2025 06:57:19 +0200
 Subject: [PATCH 02/12] Teleport to teleportAsync
 
 ---

patches/plugins/0002-Teleport-to-teleportAsync.patch

@@ -1,6 +1,6 @@
-From 827fdd17e0b561f28edcb143d0b8ed6c4234e5ce Mon Sep 17 00:00:00 2001
+From 95d1434a00824650274fe609fbc1bb466e2a462e Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <[email protected]>
-Date: Wed, 6 Aug 2025 15:10:01 +0200
+Date: Mon, 8 Sep 2025 06:57:19 +0200
 Subject: [PATCH 03/12] Replace BukkitRunnable to FoliaRunnable
 
 ---

patches/plugins/0003-Replace-BukkitRunnable-to-FoliaRunnable.patch

@@ -1,6 +1,6 @@
-From fd68aa50ac21bf60fd5fa1e34c4e53ba5b77f4d9 Mon Sep 17 00:00:00 2001
+From 88f4762159f13738382be7bbfc92cbbdb4846d1c Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <[email protected]>
-Date: Wed, 6 Aug 2025 15:10:01 +0200
+Date: Mon, 8 Sep 2025 06:57:20 +0200
 Subject: [PATCH 04/12] Replace scheduler
 
 ---
@@ -184,10 +184,10 @@ index 4008b3fe5..aa265ef49 100644
      }
 
 diff --git a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
-index 756b1558e..f1655912a 100644
+index dd7c32538..1d637376d 100644
 --- a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
 +++ b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
-@@ -414,7 +414,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
+@@ -418,7 +418,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
              alternativeCommandsHandler = new AlternativeCommandsHandler(this);
 
              timer = new EssentialsTimer(this);
@@ -196,7 +196,7 @@ index 756b1558e..f1655912a 100644
 
              Economy.setEss(this);
              execTimer.mark("RegHandler");
-@@ -425,7 +425,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
+@@ -429,7 +429,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
 
              if (!TESTING) {
                  updateChecker = new UpdateChecker(this);
@@ -205,7 +205,7 @@ index 756b1558e..f1655912a 100644
                      getLogger().log(Level.INFO, AdventureUtil.miniToLegacy(tlLiteral("versionFetching")));
                      for (final Component component : updateChecker.getVersionMessages(false, true, new CommandSource(this, Bukkit.getConsoleSender()))) {
                          getLogger().log(getSettings().isUpdateCheckEnabled() ? Level.WARNING : Level.INFO, AdventureUtil.adventureToLegacy(component));
-@@ -874,9 +874,32 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
+@@ -878,9 +878,32 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
 
      @Override
      public BukkitScheduler getScheduler() {
@@ -238,7 +238,7 @@ index 756b1558e..f1655912a 100644
      @Override
      public IJails getJails() {
          return jails;
-@@ -1181,31 +1204,37 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
+@@ -1205,31 +1228,37 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
 
      @Override
      public BukkitTask runTaskAsynchronously(final Runnable run) {
@@ -311,10 +311,10 @@ index 1d1fbff1e..be38466e9 100644
                      event.setCancelled(true);
                      return;
 diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
-index 013ef74d6..9a016a2eb 100644
+index fc602641e..f0eecdfaa 100644
 --- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
 +++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
-@@ -85,7 +85,7 @@ import static com.earth2me.essentials.I18n.tlLiteral;
+@@ -88,7 +88,7 @@ import static com.earth2me.essentials.I18n.tlLiteral;
 
  public class EssentialsPlayerListener implements Listener, FakeAccessor {
      private final transient IEssentials ess;
@@ -323,7 +323,7 @@ index 013ef74d6..9a016a2eb 100644
 
      public EssentialsPlayerListener(final IEssentials parent) {
          this.ess = parent;
-@@ -272,9 +272,9 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
+@@ -275,9 +275,9 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
      public void onPlayerQuit(final PlayerQuitEvent event) {
          final User user = ess.getUser(event.getPlayer());
 
@@ -335,7 +335,7 @@ index 013ef74d6..9a016a2eb 100644
          }
 
          if (hideJoinQuitMessages() || (ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentquit"))) {
-@@ -327,7 +327,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
+@@ -330,7 +330,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
      @EventHandler(priority = EventPriority.HIGHEST)
      public void onPlayerJoin(final PlayerJoinEvent event) {
          final String joinMessage = event.getJoinMessage();
@@ -344,7 +344,7 @@ index 013ef74d6..9a016a2eb 100644
 
          if (hideJoinQuitMessages() || ess.getSettings().allowSilentJoinQuit() || ess.getSettings().isCustomJoinMessage()) {
              event.setJoinMessage(null);
-@@ -422,13 +422,13 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
+@@ -426,13 +426,13 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
                      effectiveMessage = message;
                  }
 
@@ -360,7 +360,7 @@ index 013ef74d6..9a016a2eb 100644
                      } else {
                          motdTask.run();
                      }
-@@ -445,7 +445,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
+@@ -449,7 +449,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
                  }
 
                  if (user.isAuthorized("essentials.updatecheck")) {
@@ -369,7 +369,7 @@ index 013ef74d6..9a016a2eb 100644
                          for (final Component component : ess.getUpdateChecker().getVersionMessages(false, false, user.getSource())) {
                              user.sendComponent(component);
                          }
-@@ -520,7 +520,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
+@@ -524,7 +524,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
              }
          }
 
@@ -378,7 +378,7 @@ index 013ef74d6..9a016a2eb 100644
      }
 
      // Makes the compass item ingame always point to the first essentials home.  #EasterEgg
-@@ -632,7 +632,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
+@@ -636,7 +636,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
          final User user = ess.getUser(event.getPlayer());
          if (user.hasUnlimited(new ItemStack(event.getBucket()))) {
              event.getItemStack().setType(event.getBucket());
@@ -387,7 +387,7 @@ index 013ef74d6..9a016a2eb 100644
          }
      }
 
-@@ -890,7 +890,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
+@@ -894,7 +894,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
                  }
              }
 
@@ -396,7 +396,7 @@ index 013ef74d6..9a016a2eb 100644
          } catch (final Exception ex) {
              if (ess.getSettings().isDebug()) {
                  ess.getLogger().log(Level.WARNING, ex.getMessage(), ex);
-@@ -921,7 +921,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
+@@ -925,7 +925,7 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
                      }
                  }
 
@@ -405,7 +405,7 @@ index 013ef74d6..9a016a2eb 100644
 
              }
          }
-@@ -983,7 +983,8 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
+@@ -987,7 +987,8 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
          }
 
          if (refreshPlayer != null) {
@@ -415,7 +415,7 @@ index 013ef74d6..9a016a2eb 100644
          }
      }
 
-@@ -1026,7 +1027,8 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
+@@ -1050,7 +1051,8 @@ public class EssentialsPlayerListener implements Listener, FakeAccessor {
          }
 
          if (refreshPlayer != null) {
@@ -466,10 +466,10 @@ index 667e5e93b..18e5349a8 100644
                          this.getCachedLocations(name).add(location);
                      }
 diff --git a/Essentials/src/main/java/com/earth2me/essentials/Settings.java b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
-index b9cb054e6..916b0748c 100644
+index daa7a3595..e34c831d8 100644
 --- a/Essentials/src/main/java/com/earth2me/essentials/Settings.java
 +++ b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
-@@ -836,7 +836,7 @@ public class Settings implements net.ess3.api.ISettings {
+@@ -837,7 +837,7 @@ public class Settings implements net.ess3.api.ISettings {
              if (reloadCount.get() < 2) {
                  // on startup: add plugins again in case they registered commands with the new API
                  // we need to schedule this task before any of the below tasks using _addAlternativeCommand.
@@ -478,7 +478,7 @@ index b9cb054e6..916b0748c 100644
                      for (final Plugin plugin : ess.getServer().getPluginManager().getPlugins()) {
                          if (plugin.isEnabled()) {
                              ess.getAlternativeCommandsHandler().addPlugin(plugin);
-@@ -862,7 +862,7 @@ public class Settings implements net.ess3.api.ISettings {
+@@ -863,7 +863,7 @@ public class Settings implements net.ess3.api.ISettings {
 
                      // This is 2 because Settings are reloaded twice in the startup lifecycle
                      if (reloadCount.get() < 2) {
@@ -487,7 +487,7 @@ index b9cb054e6..916b0748c 100644
                      } else {
                          _addAlternativeCommand(effectiveAlias, toDisable);
                      }
-@@ -877,7 +877,7 @@ public class Settings implements net.ess3.api.ISettings {
+@@ -878,7 +878,7 @@ public class Settings implements net.ess3.api.ISettings {
                      ess.getLogger().log(Level.INFO, "Syncing commands");
                  }
                  if (reloadCount.get() < 2) {
@@ -785,7 +785,7 @@ index c06d2f16e..230ee23f0 100644
      }
 
 diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandseen.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandseen.java
-index 6827650c5..c3d158be7 100644
+index 0c1065bef..7e2781128 100644
 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandseen.java
 +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandseen.java
 @@ -61,7 +61,7 @@ public class Commandseen extends EssentialsCommand {
@@ -797,7 +797,7 @@ index 6827650c5..c3d158be7 100644
                  @Override
                  public void run() {
                      final User userFromBukkit = ess.getUsers().getUser(args[0]);
-@@ -199,7 +199,7 @@ public class Commandseen extends EssentialsCommand {
+@@ -203,7 +203,7 @@ public class Commandseen extends EssentialsCommand {
      private void seenIP(final CommandSource sender, final String ipAddress, final String display) {
          sender.sendTl("runningPlayerMatch", AdventureUtil.parsed(AdventureUtil.legacyToMini(display)));
 
@@ -899,10 +899,10 @@ index e47e25cda..aedec1bdb 100644
                  getLogger().log(Level.SEVERE, AdventureUtil.miniToLegacy(tlLiteral("discordErrorLogin", e.getMessage())));
                  if (ess.getSettings().isDebug()) {
 diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
-index 210a81b21..a84efbe16 100644
+index cdaa1ceec..e970aa4ee 100644
 --- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
 +++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
-@@ -238,7 +238,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
+@@ -260,7 +260,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
              logger.log(Level.WARNING, "Error while loading the achievement/advancement listener. You will not receive achievement/advancement notifications on Discord.", e);
          }
 
@@ -911,7 +911,7 @@ index 210a81b21..a84efbe16 100644
 
          Bukkit.getServicesManager().register(DiscordService.class, this, plugin, ServicePriority.Normal);
      }
-@@ -267,11 +267,11 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
+@@ -289,11 +289,11 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
              logger.warning("Sending message to channel \"" + type.getKey() + "\" which is an unregistered type! If you are a plugin author, you should be registering your MessageType before using them.");
          }
          final DiscordMessageEvent event = new DiscordMessageEvent(type, FormatUtil.stripFormat(message), allowGroupMentions);

patches/plugins/0004-Replace-scheduler.patch

@@ -1,6 +1,6 @@
-From fbecb29f5fabfc44f66a43984c1906a22358e530 Mon Sep 17 00:00:00 2001
+From 335c3dc480b68f2c67563d5bbb7d7daa06784725 Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <[email protected]>
-Date: Wed, 6 Aug 2025 15:10:02 +0200
+Date: Mon, 8 Sep 2025 06:57:21 +0200
 Subject: [PATCH 05/12] Fix command time
 
 ---

patches/plugins/0005-Fix-command-time.patch

@@ -1,6 +1,6 @@
-From 7e8d1790881bc69bfc50939e7df19937dd35f2c3 Mon Sep 17 00:00:00 2001
+From ad2de4f0f6f7a51f5dfa2f5d3f751affeecde9fc Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <[email protected]>
-Date: Wed, 6 Aug 2025 15:10:02 +0200
+Date: Mon, 8 Sep 2025 06:57:21 +0200
 Subject: [PATCH 06/12] Fix dispatch command
 
 ---

patches/plugins/0006-Fix-dispatch-command.patch

@@ -1,6 +1,6 @@
-From 85b654a3b12dcbcc73111ecc1bce5b2a88d7114d Mon Sep 17 00:00:00 2001
+From 978633edc1b681934ba1a5f622d496bedcdb3297 Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <[email protected]>
-Date: Wed, 6 Aug 2025 15:10:02 +0200
+Date: Mon, 8 Sep 2025 06:57:21 +0200
 Subject: [PATCH 07/12] Fix command gc
 
 ---

patches/plugins/0007-Fix-command-gc.patch

@@ -1,6 +1,6 @@
-From 5964935ae1eef2a0451557d5517d25221b821462 Mon Sep 17 00:00:00 2001
+From 24d7465f95f1d98f1ae27e77b4d888dd4d48c2a3 Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <[email protected]>
-Date: Wed, 6 Aug 2025 15:10:03 +0200
+Date: Mon, 8 Sep 2025 06:57:22 +0200
 Subject: [PATCH 08/12] Fix Stop Server task
 
 ---
@@ -40,10 +40,10 @@ index aedec1bdb..c3e77124a 100644
          return jda != null && jda.isInvalidStartup();
      }
 diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
-index a84efbe16..4cfb0efda 100644
+index e970aa4ee..268bc470b 100644
 --- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
 +++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
-@@ -270,7 +270,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
+@@ -292,7 +292,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
  //        if (Bukkit.getServer().isPrimaryThread()) {
  //            Bukkit.getPluginManager().callEvent(event);
  //        } else {

patches/plugins/0008-Fix-Stop-Server-task.patch

@@ -1,6 +1,6 @@
-From 5b2bf642150faf97cf75084aaa884551a886c046 Mon Sep 17 00:00:00 2001
+From db6a6423088f55b846a299483cc5335eef699411 Mon Sep 17 00:00:00 2001
 From: Euphyllia Bierque <[email protected]>
-Date: Wed, 6 Aug 2025 15:10:03 +0200
+Date: Mon, 8 Sep 2025 06:57:22 +0200
 Subject: [PATCH 09/12] Fix command killall
 
 ---