Skip to content

Commit 2aae123

Browse files
EuphillyaEuphillya
committed
Update Upstream EssentialsX:
EssentialsX@196a2a1 Fix startup issue with potion providers (EssentialsX#6055) EssentialsX@8313d52 Add config for use of Paper chat events (EssentialsX#6050) EssentialsX@3025ba5 Fix NPE when chat messages are canceled EssentialsX@5a839c4 Fix modifying messages with Paper chat events EssentialsX@e3e247d Add discord module support for Paper's chat events (EssentialsX#5908) EssentialsX@263dab5 Fix spawn command sending message before teleportation (EssentialsX#6025) EssentialsX@f5efa26 Fix per-world flight permissions EssentialsX@1ff24cb Use an identity map for Paper chat listener (EssentialsX#6067) EssentialsX@bad79b7 Fix /book command on 1.20+ (EssentialsX#6064) EssentialsX@5458241 Fix expired mails showing as unread on join (EssentialsX#6063) EssentialsX@fe27182 New Crowdin updates (EssentialsX#6037) EssentialsX@ba5257c Fix translation error in EssentialsSign#getItemStack EssentialsX@e49021f Fix item overflow issue with kits & trade signs EssentialsX@b5748eb Update various dependencies (EssentialsX#6078)
1 parent ce59a23 commit 2aae123

12 files changed

+58
-36
lines changed

‎Essentials‎

Submodule Essentials updated 27 files

‎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 70dc23a27e2485fcdd2ede9680e05ac7ad185932 Mon Sep 17 00:00:00 2001
1+
From 51ad242756b52a282565bc8ea5bd8f48809249f4 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Tue, 18 Feb 2025 14:37:38 +0100
3+
Date: Sat, 1 Mar 2025 13:34:48 +0100
44
Subject: [PATCH 01/11] Rebrand
55

66
---
@@ -77,7 +77,7 @@ similarity index 100%
7777
rename from Essentials/src/test/java/com/earth2me/essentials/utils/StringUtilTest.java
7878
rename to Essentials/src/testaaa/java/com/earth2me/essentials/utils/StringUtilTest.java
7979
diff --git a/EssentialsDiscord/build.gradle b/EssentialsDiscord/build.gradle
80-
index 854011f8d..1b31d233c 100644
80+
index 3fc6ee806..8fcc7087d 100644
8181
--- a/EssentialsDiscord/build.gradle
8282
+++ b/EssentialsDiscord/build.gradle
8383
@@ -11,7 +11,7 @@ dependencies {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 5ab19a7dfc0aeaf5c7650ec7d02f5f7459ec5835 Mon Sep 17 00:00:00 2001
1+
From d071623a115dfe6cba9ba4ba8b2a30f847051438 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Tue, 18 Feb 2025 14:37:38 +0100
3+
Date: Sat, 1 Mar 2025 13:34:48 +0100
44
Subject: [PATCH 02/11] Teleport to teleportAsync
55

66
---

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From d2924bb5299790613c836b768c5e137ad600c623 Mon Sep 17 00:00:00 2001
1+
From ee48535dd35a2f7fe3c992e2547bf01735c388a5 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Tue, 18 Feb 2025 14:37:39 +0100
3+
Date: Sat, 1 Mar 2025 13:34:49 +0100
44
Subject: [PATCH 03/11] Replace BukkitRunnable to FoliaRunnable
55

66
---

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

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From de99b1c42e4bc9459ed7c7662e867db09b246b86 Mon Sep 17 00:00:00 2001
1+
From 826d5a787d30da71fa14b6e4689eef0ccd9871e4 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Tue, 18 Feb 2025 14:37:39 +0100
3+
Date: Sat, 1 Mar 2025 13:34:49 +0100
44
Subject: [PATCH 04/11] Replace scheduler
55

66
---
@@ -38,6 +38,7 @@ Subject: [PATCH 04/11] Replace scheduler
3838
.../discord/listeners/BukkitChatListener.java | 4 +--
3939
.../listeners/DiscordCommandDispatcher.java | 2 +-
4040
.../listeners/EssentialsChatListener.java | 4 +--
41+
.../discord/listeners/PaperChatListener.java | 4 +--
4142
.../discord/util/ConsoleInjector.java | 10 +++---
4243
.../discord/util/DiscordCommandSender.java | 10 +++---
4344
.../essentialsx/discord/util/DiscordUtil.java | 10 +++---
@@ -52,7 +53,7 @@ Subject: [PATCH 04/11] Replace scheduler
5253
EssentialsSpawn/src/main/resources/plugin.yml | 1 +
5354
.../xmpp/EssentialsXMPPPlayerListener.java | 6 ++--
5455
.../earth2me/essentials/xmpp/XMPPManager.java | 2 +-
55-
48 files changed, 202 insertions(+), 143 deletions(-)
56+
49 files changed, 204 insertions(+), 145 deletions(-)
5657

5758
diff --git a/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java b/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java
5859
index 4d0cedd55..9aa6ef062 100644
@@ -329,7 +330,7 @@ index ee0d998e2..e84ea6448 100644
329330
event.setCancelled(true);
330331
return;
331332
diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
332-
index 84a190a02..04cb68478 100644
333+
index 753b3b9a0..f8dd4ea88 100644
333334
--- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
334335
+++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
335336
@@ -85,7 +85,7 @@ import static com.earth2me.essentials.I18n.tlLiteral;
@@ -484,10 +485,10 @@ index 163e76dca..d0940d514 100644
484485
this.getCachedLocations(name).add(location);
485486
}
486487
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Settings.java b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
487-
index 2334d93e1..dd4d6ab22 100644
488+
index f04347ae4..bede23354 100644
488489
--- a/Essentials/src/main/java/com/earth2me/essentials/Settings.java
489490
+++ b/Essentials/src/main/java/com/earth2me/essentials/Settings.java
490-
@@ -830,7 +830,7 @@ public class Settings implements net.ess3.api.ISettings {
491+
@@ -835,7 +835,7 @@ public class Settings implements net.ess3.api.ISettings {
491492
if (reloadCount.get() < 2) {
492493
// on startup: add plugins again in case they registered commands with the new API
493494
// we need to schedule this task before any of the below tasks using _addAlternativeCommand.
@@ -496,7 +497,7 @@ index 2334d93e1..dd4d6ab22 100644
496497
for (final Plugin plugin : ess.getServer().getPluginManager().getPlugins()) {
497498
if (plugin.isEnabled()) {
498499
ess.getAlternativeCommandsHandler().addPlugin(plugin);
499-
@@ -856,7 +856,7 @@ public class Settings implements net.ess3.api.ISettings {
500+
@@ -861,7 +861,7 @@ public class Settings implements net.ess3.api.ISettings {
500501

501502
// This is 2 because Settings are reloaded twice in the startup lifecycle
502503
if (reloadCount.get() < 2) {
@@ -505,7 +506,7 @@ index 2334d93e1..dd4d6ab22 100644
505506
} else {
506507
_addAlternativeCommand(effectiveAlias, toDisable);
507508
}
508-
@@ -871,7 +871,7 @@ public class Settings implements net.ess3.api.ISettings {
509+
@@ -876,7 +876,7 @@ public class Settings implements net.ess3.api.ISettings {
509510
ess.getLogger().log(Level.INFO, "Syncing commands");
510511
}
511512
if (reloadCount.get() < 2) {
@@ -950,10 +951,10 @@ index e47e25cda..aedec1bdb 100644
950951
getLogger().log(Level.SEVERE, AdventureUtil.miniToLegacy(tlLiteral("discordErrorLogin", e.getMessage())));
951952
if (ess.getSettings().isDebug()) {
952953
diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
953-
index 2843e55af..07c050e90 100644
954+
index 96a8300a9..404679f4d 100644
954955
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
955956
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
956-
@@ -237,7 +237,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
957+
@@ -238,7 +238,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
957958
logger.log(Level.WARNING, "Error while loading the achievement/advancement listener. You will not receive achievement/advancement notifications on Discord.", e);
958959
}
959960

@@ -962,7 +963,7 @@ index 2843e55af..07c050e90 100644
962963

963964
Bukkit.getServicesManager().register(DiscordService.class, this, plugin, ServicePriority.Normal);
964965
}
965-
@@ -266,11 +266,11 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
966+
@@ -267,11 +267,11 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
966967
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.");
967968
}
968969
final DiscordMessageEvent event = new DiscordMessageEvent(type, FormatUtil.stripFormat(message), allowGroupMentions);
@@ -1069,6 +1070,27 @@ index debd6783d..1c26faf35 100644
10691070
jda.sendChatMessage(event.getChatType(), player, chatEvent.getMessage());
10701071
}
10711072
- });
1073+
+ }, null);
1074+
}
1075+
}
1076+
diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/PaperChatListener.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/PaperChatListener.java
1077+
index 6f5588fe4..089b54f97 100644
1078+
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/PaperChatListener.java
1079+
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/PaperChatListener.java
1080+
@@ -22,7 +22,7 @@ public class PaperChatListener extends PaperChatListenerProvider {
1081+
}
1082+
1083+
final Player player = event.getPlayer();
1084+
- Bukkit.getScheduler().runTask(jda.getPlugin(), () -> {
1085+
+ player.getScheduler().run(jda.getPlugin(), (task) -> {
1086+
final DiscordChatMessageEvent chatEvent = new DiscordChatMessageEvent(event.getPlayer(), event.getMessage(), ChatType.UNKNOWN);
1087+
chatEvent.setCancelled(!jda.getSettings().isShowAllChat() && !event.recipients().containsAll(Bukkit.getOnlinePlayers()));
1088+
Bukkit.getPluginManager().callEvent(chatEvent);
1089+
@@ -31,6 +31,6 @@ public class PaperChatListener extends PaperChatListenerProvider {
1090+
}
1091+
1092+
jda.sendChatMessage(player, chatEvent.getMessage());
1093+
- });
10721094
+ }, null);
10731095
}
10741096
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 964b091c1dd7b799d6af6f97d89c459287bb1ff6 Mon Sep 17 00:00:00 2001
1+
From 899348ed0230e136a5d70ffba40294d2c1bee949 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Tue, 18 Feb 2025 14:37:39 +0100
3+
Date: Sat, 1 Mar 2025 13:34:49 +0100
44
Subject: [PATCH 05/11] 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 d50077bc9add3132acae81fc1755619003b6fd13 Mon Sep 17 00:00:00 2001
1+
From 361b4309b33d63ebe1b60fb0d414003fb558a22e Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Tue, 18 Feb 2025 14:37:40 +0100
3+
Date: Sat, 1 Mar 2025 13:34:50 +0100
44
Subject: [PATCH 06/11] Fix dispatch command
55

66
---
@@ -22,7 +22,7 @@ index ecda39ad9..4ae2cf229 100644
2222
taskLock.complete(new Object());
2323
return;
2424
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Kit.java b/Essentials/src/main/java/com/earth2me/essentials/Kit.java
25-
index 2c9753e04..6b81c4d8a 100644
25+
index e32ade33e..bb2f4ed02 100644
2626
--- a/Essentials/src/main/java/com/earth2me/essentials/Kit.java
2727
+++ b/Essentials/src/main/java/com/earth2me/essentials/Kit.java
2828
@@ -262,9 +262,13 @@ public class Kit {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 2bf7f9adb7e463f1c0b440a6b2515e0250121ad1 Mon Sep 17 00:00:00 2001
1+
From 9b329105c26a03d0d35ac0cc7ec9077d3439c785 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Tue, 18 Feb 2025 14:37:40 +0100
3+
Date: Sat, 1 Mar 2025 13:34:50 +0100
44
Subject: [PATCH 07/11] Fix command gc
55

66
---

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 2d7cb37384b7ead45c317ed3952d0a838694afa8 Mon Sep 17 00:00:00 2001
1+
From 76136dfb9877d9ca23592388af4172f1c78b822c Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Tue, 18 Feb 2025 14:37:40 +0100
3+
Date: Sat, 1 Mar 2025 13:34:50 +0100
44
Subject: [PATCH 08/11] Fix Stop Server task
55

66
---
@@ -44,10 +44,10 @@ index aedec1bdb..b875a98fe 100644
4444
}
4545
}
4646
diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
47-
index 07c050e90..0351649bd 100644
47+
index 404679f4d..9b952c83b 100644
4848
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
4949
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
50-
@@ -267,7 +267,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
50+
@@ -268,7 +268,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
5151
}
5252
final DiscordMessageEvent event = new DiscordMessageEvent(type, FormatUtil.stripFormat(message), allowGroupMentions);
5353
//if (Bukkit.getServer().isPrimaryThread()) { // Euphyllia

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From b46c6127cf01ec2f9cfa5d2cc677fd8ba433eb20 Mon Sep 17 00:00:00 2001
1+
From 3fe4ba97afb1486a0447b994f82cb3ef062196cb Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Tue, 18 Feb 2025 14:37:40 +0100
3+
Date: Sat, 1 Mar 2025 13:34:50 +0100
44
Subject: [PATCH 09/11] Fix command killall
55

66
---

0 commit comments

Comments
 (0)