Skip to content

Commit 1d3ed8f

Browse files
EuphillyaEuphillya
committed
Update Upstream EssentialsX:
EssentialsX@000e6c5 Mirror dumps on gist (EssentialsX#6193) EssentialsX@b349517 Fix Spigot 1.21.10+ ReflServerStateProvider (EssentialsX#6377) EssentialsX@ac66618 Fix error when running /helpop from console (EssentialsX#6385) EssentialsX@68c304e Fix /balance behavior for vanished players (EssentialsX#6386) EssentialsX@9ad754b Use Discord name instead of tag for /msg sender (EssentialsX#6383)
1 parent 15bb918 commit 1d3ed8f

15 files changed

Lines changed: 45 additions & 45 deletions

‎Essentials‎

‎patches/plugins/0001-Rebrand.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From c5f32fd4395de0d8b5ccef69d44ebaca942d90d3 Mon Sep 17 00:00:00 2001
2-
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Wed, 17 Dec 2025 17:49:20 +0100
1+
From 58d3c3499e405da266228734333f4cd681ca1533 Mon Sep 17 00:00:00 2001
2+
From: Bierque Euphyllia <bierque.euphyllia@gmail.com>
3+
Date: Sun, 4 Jan 2026 14:46:59 +0100
44
Subject: [PATCH 01/14] Rebrand
55

66
---

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 4fe79c327a80cf1d689fb1075830932c16e07e99 Mon Sep 17 00:00:00 2001
2-
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Wed, 17 Dec 2025 17:49:20 +0100
1+
From 770b0f39e0f7c99ea1529ebaf564454175cfff42 Mon Sep 17 00:00:00 2001
2+
From: Bierque Euphyllia <bierque.euphyllia@gmail.com>
3+
Date: Sun, 4 Jan 2026 14:46:59 +0100
44
Subject: [PATCH 02/14] Teleport to teleportAsync
55

66
---

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 597d5bb486bb7ca1653496363d2f4826a6d52587 Mon Sep 17 00:00:00 2001
2-
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Wed, 17 Dec 2025 17:49:21 +0100
1+
From 42d87eacff480c52bcf8b3f582da37e5642bc00e Mon Sep 17 00:00:00 2001
2+
From: Bierque Euphyllia <bierque.euphyllia@gmail.com>
3+
Date: Sun, 4 Jan 2026 14:46:59 +0100
44
Subject: [PATCH 03/14] Replace BukkitRunnable to FoliaRunnable
55

66
---

‎patches/plugins/0004-Replace-scheduler.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From daacee716e6e209d49da191a040eb06c18cc96d2 Mon Sep 17 00:00:00 2001
2-
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Wed, 17 Dec 2025 17:49:21 +0100
1+
From 33ae5f2669030be3df4a32214e78c25d1229e620 Mon Sep 17 00:00:00 2001
2+
From: Bierque Euphyllia <bierque.euphyllia@gmail.com>
3+
Date: Sun, 4 Jan 2026 14:47:00 +0100
44
Subject: [PATCH 04/14] Replace scheduler
55

66
---
@@ -838,11 +838,11 @@ index 09e1a9fad..b30a36eec 100644
838838
Bukkit.dispatchCommand(new DiscordCommandSender(jda, Bukkit.getConsoleSender(), message -> event.reply(MessageUtil.sanitizeDiscordMarkdown(message))).getSender(), command);
839839
} catch (CommandException e) {
840840
diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/interactions/commands/MessageCommand.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/interactions/commands/MessageCommand.java
841-
index 94f00faf6..d9ec76894 100644
841+
index 28a6ee0d5..a9b4a4ae2 100644
842842
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/interactions/commands/MessageCommand.java
843843
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/interactions/commands/MessageCommand.java
844844
@@ -55,7 +55,7 @@ public class MessageCommand extends InteractionCommandImpl {
845-
user.sendTl("msgFormat", event.getMember().getTag(), AdventureUtil.parsed(user.playerTl("meRecipient")), message);
845+
user.sendTl("msgFormat", event.getMember().getName(), AdventureUtil.parsed(user.playerTl("meRecipient")), message);
846846
// We use an atomic reference here so that java will garbage collect the recipient
847847
final AtomicReference<DiscordMessageRecipient> ref = new AtomicReference<>(new DiscordMessageRecipient(event.getMember()));
848848
- jda.getPlugin().getEss().runTaskLaterAsynchronously(() -> ref.set(null), 6000); // Expires after 5 minutes

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 3a08a35d1135e89e349eef58fad4d371169d5d37 Mon Sep 17 00:00:00 2001
2-
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Wed, 17 Dec 2025 17:49:22 +0100
1+
From 84253bd49017b7e8ca0cd2e9fd831da1976268a0 Mon Sep 17 00:00:00 2001
2+
From: Bierque Euphyllia <bierque.euphyllia@gmail.com>
3+
Date: Sun, 4 Jan 2026 14:47:00 +0100
44
Subject: [PATCH 05/14] Fix command time
55

66
---

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 0315f92a3a66fa50a5a98d5bf792a39911fc95e5 Mon Sep 17 00:00:00 2001
2-
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Wed, 17 Dec 2025 17:49:22 +0100
1+
From 2066aea826db0f1e77a5d4e9785924420790afa2 Mon Sep 17 00:00:00 2001
2+
From: Bierque Euphyllia <bierque.euphyllia@gmail.com>
3+
Date: Sun, 4 Jan 2026 14:47:00 +0100
44
Subject: [PATCH 06/14] Fix dispatch command
55

66
---

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 3ecec4aeae690cb0a52650dd7fb60c1831843080 Mon Sep 17 00:00:00 2001
2-
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Wed, 17 Dec 2025 17:49:22 +0100
1+
From ef65c3dd7242b0651ad69c030e9ecd02f4d282b6 Mon Sep 17 00:00:00 2001
2+
From: Bierque Euphyllia <bierque.euphyllia@gmail.com>
3+
Date: Sun, 4 Jan 2026 14:47:01 +0100
44
Subject: [PATCH 07/14] Fix command gc
55

66
---

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 2a06f17fcf9ede3965e2cdd7fa6a01327efe9c14 Mon Sep 17 00:00:00 2001
2-
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Wed, 17 Dec 2025 17:49:22 +0100
1+
From 031a621fe426a3c94d97fa133d0961c7b9e80e5e Mon Sep 17 00:00:00 2001
2+
From: Bierque Euphyllia <bierque.euphyllia@gmail.com>
3+
Date: Sun, 4 Jan 2026 14:47:01 +0100
44
Subject: [PATCH 08/14] Fix Stop Server task
55

66
---

‎patches/plugins/0009-Fix-command-killall.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From cb9327a1f95eb020a67405f220090899882ad5bf Mon Sep 17 00:00:00 2001
2-
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Wed, 17 Dec 2025 17:49:23 +0100
1+
From 29531fc425237b05eb6ee4fef87a53ac3359493b Mon Sep 17 00:00:00 2001
2+
From: Bierque Euphyllia <bierque.euphyllia@gmail.com>
3+
Date: Sun, 4 Jan 2026 14:47:01 +0100
44
Subject: [PATCH 09/14] Fix command killall
55

66
---

0 commit comments

Comments
 (0)