Skip to content

Commit 15bb918

Browse files
committed
Update Upstream EssentialsX:
EssentialsX@faa02b5 Fix event thread assignment in TeleportWarmupCancelledEvent (EssentialsX#6371) EssentialsX@b0ef568 Update to Minecraft 1.21.11 (EssentialsX#6364)
1 parent bf333e1 commit 15bb918

15 files changed

Lines changed: 265 additions & 72 deletions

patches/plugins/0001-Rebrand.patch

Lines changed: 224 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
From 3bce1a094fa553ab04840d2dac2f9bb5048bcb0e Mon Sep 17 00:00:00 2001
1+
From c5f32fd4395de0d8b5ccef69d44ebaca942d90d3 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Tue, 2 Dec 2025 11:58:15 +0100
3+
Date: Wed, 17 Dec 2025 17:49:20 +0100
44
Subject: [PATCH 01/14] Rebrand
55

66
---
7-
Essentials/src/main/resources/plugin.yml | 1 +
8-
EssentialsAntiBuild/src/main/resources/plugin.yml | 2 ++
9-
EssentialsChat/src/main/resources/plugin.yml | 1 +
10-
EssentialsDiscord/src/main/resources/plugin.yml | 1 +
11-
EssentialsDiscordLink/src/main/resources/plugin.yml | 1 +
12-
EssentialsGeoIP/src/main/resources/plugin.yml | 1 +
13-
EssentialsProtect/src/main/resources/plugin.yml | 1 +
14-
EssentialsSpawn/src/main/resources/plugin.yml | 1 +
15-
EssentialsXMPP/src/main/resources/plugin.yml | 1 +
16-
.../src/main/kotlin/essentials.base-conventions.gradle.kts | 2 +-
17-
build.gradle | 2 +-
18-
11 files changed, 12 insertions(+), 2 deletions(-)
7+
Essentials/src/main/resources/plugin.yml | 1 +
8+
.../src/main/resources/plugin.yml | 88 +++++++++---------
9+
EssentialsChat/src/main/resources/plugin.yml | 1 +
10+
.../src/main/resources/plugin.yml | 1 +
11+
.../src/main/resources/plugin.yml | 1 +
12+
EssentialsGeoIP/src/main/resources/plugin.yml | 29 +++---
13+
.../src/main/resources/plugin.yml | 89 ++++++++++---------
14+
EssentialsSpawn/src/main/resources/plugin.yml | 1 +
15+
EssentialsXMPP/src/main/resources/plugin.yml | 1 +
16+
.../essentials.base-conventions.gradle.kts | 2 +-
17+
build.gradle | 2 +-
18+
11 files changed, 113 insertions(+), 103 deletions(-)
1919

2020
diff --git a/Essentials/src/main/resources/plugin.yml b/Essentials/src/main/resources/plugin.yml
2121
index 844f92319..6081ddfc6 100644
@@ -30,13 +30,96 @@ index 844f92319..6081ddfc6 100644
3030
afk:
3131
description: Marks you as away-from-keyboard.
3232
diff --git a/EssentialsAntiBuild/src/main/resources/plugin.yml b/EssentialsAntiBuild/src/main/resources/plugin.yml
33-
index bbfd21dd7..4824e418b 100644
33+
index bbfd21dd7..a1009892f 100644
3434
--- a/EssentialsAntiBuild/src/main/resources/plugin.yml
3535
+++ b/EssentialsAntiBuild/src/main/resources/plugin.yml
36-
@@ -41,3 +41,5 @@ permissions:
37-
essentials.protect.exemptbreak: true
38-
essentials.protect.exemptplacement: true
39-
essentials.protect.exemptusage: true
36+
@@ -1,43 +1,45 @@
37+
-name: EssentialsAntiBuild
38+
-main: com.earth2me.essentials.antibuild.EssentialsAntiBuild
39+
-# Note to developers: This next line cannot change, or the automatic versioning system will break.
40+
-version: ${full.version}
41+
-website: https://essentialsx.net/
42+
-description: Provides build protection.
43+
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, Iaccidentally, drtshock, mdcfe]
44+
-depend: [Essentials]
45+
-api-version: "1.13"
46+
-
47+
-permissions:
48+
- essentials.build:
49+
- description: Allows the bearer to build
50+
- essentials.build.place.<material>:
51+
- description: Allows the bearer to place the specified material
52+
- essentials.build.break.<material>:
53+
- description: Allows the bearer to break the specified material
54+
- essentials.build.interact.<material>:
55+
- description: Allows the bearer to interact with the specified material
56+
- essentials.build.craft.<material>:
57+
- description: Allows the bearer to craft the specified material
58+
- essentials.build.drop.<material>:
59+
- description: Allows the bearer to drop the specified material
60+
- essentials.build.pickup.<material>:
61+
- description: Allows the bearer to pick up the specified material
62+
- essentials.protect.alerts:
63+
- description: Allows the bearer to receive protect alerts
64+
- essentials.protect.alerts.notrigger:
65+
- description: Allows the bearer to be exempt from triggering protect alerts
66+
- essentials.protect.exemptbreak:
67+
- description: Allows the bearer to be exempt from the break blacklist
68+
- essentials.protect.exemptplacement:
69+
- description: Allows the bearer to be exempt from the place blacklist
70+
- essentials.protect.exemptusage:
71+
- description: Allows the bearer to be exempt from the usage blacklist
72+
- essentials.exempt.protect:
73+
- default: false
74+
- description: Exempt from EssentialsProtect/EssentialsAntiBuild protections
75+
- children:
76+
- essentials.protect.alerts.notrigger: true
77+
- essentials.protect.exemptbreak: true
78+
- essentials.protect.exemptplacement: true
79+
- essentials.protect.exemptusage: true
80+
+name: EssentialsAntiBuild
81+
+main: com.earth2me.essentials.antibuild.EssentialsAntiBuild
82+
+# Note to developers: This next line cannot change, or the automatic versioning system will break.
83+
+version: ${full.version}
84+
+website: https://essentialsx.net/
85+
+description: Provides build protection.
86+
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, Iaccidentally, drtshock, mdcfe]
87+
+depend: [Essentials]
88+
+api-version: "1.13"
89+
+
90+
+permissions:
91+
+ essentials.build:
92+
+ description: Allows the bearer to build
93+
+ essentials.build.place.<material>:
94+
+ description: Allows the bearer to place the specified material
95+
+ essentials.build.break.<material>:
96+
+ description: Allows the bearer to break the specified material
97+
+ essentials.build.interact.<material>:
98+
+ description: Allows the bearer to interact with the specified material
99+
+ essentials.build.craft.<material>:
100+
+ description: Allows the bearer to craft the specified material
101+
+ essentials.build.drop.<material>:
102+
+ description: Allows the bearer to drop the specified material
103+
+ essentials.build.pickup.<material>:
104+
+ description: Allows the bearer to pick up the specified material
105+
+ essentials.protect.alerts:
106+
+ description: Allows the bearer to receive protect alerts
107+
+ essentials.protect.alerts.notrigger:
108+
+ description: Allows the bearer to be exempt from triggering protect alerts
109+
+ essentials.protect.exemptbreak:
110+
+ description: Allows the bearer to be exempt from the break blacklist
111+
+ essentials.protect.exemptplacement:
112+
+ description: Allows the bearer to be exempt from the place blacklist
113+
+ essentials.protect.exemptusage:
114+
+ description: Allows the bearer to be exempt from the usage blacklist
115+
+ essentials.exempt.protect:
116+
+ default: false
117+
+ description: Exempt from EssentialsProtect/EssentialsAntiBuild protections
118+
+ children:
119+
+ essentials.protect.alerts.notrigger: true
120+
+ essentials.protect.exemptbreak: true
121+
+ essentials.protect.exemptplacement: true
122+
+ essentials.protect.exemptusage: true
40123
+
41124
+folia-supported: true
42125
\ No newline at end of file
@@ -77,23 +160,133 @@ index ff92febcb..2aa180da0 100644
77160
link:
78161
description: Generates a code to link your Minecraft account to Discord.
79162
diff --git a/EssentialsGeoIP/src/main/resources/plugin.yml b/EssentialsGeoIP/src/main/resources/plugin.yml
80-
index 5a675bfc6..3537c3731 100644
163+
index 5a675bfc6..5235e49ad 100644
81164
--- a/EssentialsGeoIP/src/main/resources/plugin.yml
82165
+++ b/EssentialsGeoIP/src/main/resources/plugin.yml
83-
@@ -12,3 +12,4 @@ permissions:
84-
description: Shows the country or city of a user on login and /whois.
85-
essentials.geoip.hide:
86-
description: Hides the bearer of this permission from users with essentials.geoip.show
166+
@@ -1,14 +1,15 @@
167+
-name: EssentialsGeoIP
168+
-main: com.earth2me.essentials.geoip.EssentialsGeoIP
169+
-# Note to developers: This next line cannot change, or the automatic versioning system will break.
170+
-version: ${full.version}
171+
-website: https://essentialsx.net/
172+
-description: Shows the country or city of a user on login and /whois.
173+
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, kjiang, pop4959]
174+
-depend: [Essentials]
175+
-api-version: 1.13
176+
-permissions:
177+
- essentials.geoip.show:
178+
- description: Shows the country or city of a user on login and /whois.
179+
- essentials.geoip.hide:
180+
- description: Hides the bearer of this permission from users with essentials.geoip.show
181+
+name: EssentialsGeoIP
182+
+main: com.earth2me.essentials.geoip.EssentialsGeoIP
183+
+# Note to developers: This next line cannot change, or the automatic versioning system will break.
184+
+version: ${full.version}
185+
+website: https://essentialsx.net/
186+
+description: Shows the country or city of a user on login and /whois.
187+
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, kjiang, pop4959]
188+
+depend: [Essentials]
189+
+api-version: 1.13
190+
+permissions:
191+
+ essentials.geoip.show:
192+
+ description: Shows the country or city of a user on login and /whois.
193+
+ essentials.geoip.hide:
194+
+ description: Hides the bearer of this permission from users with essentials.geoip.show
87195
+folia-supported: true
88196
\ No newline at end of file
89197
diff --git a/EssentialsProtect/src/main/resources/plugin.yml b/EssentialsProtect/src/main/resources/plugin.yml
90-
index 027249cc9..19446bc39 100644
198+
index 027249cc9..effec167d 100644
91199
--- a/EssentialsProtect/src/main/resources/plugin.yml
92200
+++ b/EssentialsProtect/src/main/resources/plugin.yml
93-
@@ -42,3 +42,4 @@ permissions:
94-
description: Allows the bearer to take lightning damage
95-
essentials.protect.damage.wither:
96-
description: Allows the bearer to take wither damage
201+
@@ -1,44 +1,45 @@
202+
-name: EssentialsProtect
203+
-main: com.earth2me.essentials.protect.EssentialsProtect
204+
-# Note to developers: This next line cannot change, or the automatic versioning system will break.
205+
-version: ${full.version}
206+
-website: https://essentialsx.net/
207+
-description: Provides protection for various parts of the world.
208+
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, drtshock]
209+
-softdepend: [Essentials]
210+
-api-version: 1.13
211+
-permissions:
212+
- essentials.protect.entitytarget.bypass:
213+
- description: Allows the bearer to be targeted by entities
214+
- essentials.protect.pvp:
215+
- description: Allows the bearer to participate in PvP when prevent pvp is enabled
216+
- essentials.protect.damage.disable:
217+
- description: Allows the bearer to not take damage
218+
- essentials.protect.damage.contact:
219+
- description: Allows the bearer to take damage from cacti and other contact damage
220+
- essentials.protect.damage.lava:
221+
- description: Allows the bearer to take damage from lava
222+
- essentials.protect.damage.tnt:
223+
- description: Allows the bearer to take damage from TNT
224+
- essentials.protect.damage.creeper:
225+
- description: Allows the bearer to take damage from creepers
226+
- essentials.protect.damage.fireball:
227+
- description: Allows the bearer to take damage from fireballs
228+
- essentials.protect.damage.witherskull:
229+
- description: Allows the bearer to take damage from wither skulls
230+
- essentials.protect.damage.tnt-minecraft:
231+
- description: Allows the bearer to take damage from a tnt minecart
232+
- essentials.protect.damage.projectiles:
233+
- description: Allows the bearer to take damage from projectiles
234+
- essentials.protect.damage.fall:
235+
- description: Allows the bearer to take fall damage
236+
- essentials.protect.damage.suffocation:
237+
- description: Allows the bearer to take suffocation damage
238+
- essentials.protect.damage.fire:
239+
- description: Allows the bearer to take fire damage
240+
- essentials.protect.damage.drowning:
241+
- description: Allows the bearer to take drowning damage
242+
- essentials.protect.damage.lightning:
243+
- description: Allows the bearer to take lightning damage
244+
- essentials.protect.damage.wither:
245+
- description: Allows the bearer to take wither damage
246+
+name: EssentialsProtect
247+
+main: com.earth2me.essentials.protect.EssentialsProtect
248+
+# Note to developers: This next line cannot change, or the automatic versioning system will break.
249+
+version: ${full.version}
250+
+website: https://essentialsx.net/
251+
+description: Provides protection for various parts of the world.
252+
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, drtshock]
253+
+softdepend: [Essentials]
254+
+api-version: 1.13
255+
+permissions:
256+
+ essentials.protect.entitytarget.bypass:
257+
+ description: Allows the bearer to be targeted by entities
258+
+ essentials.protect.pvp:
259+
+ description: Allows the bearer to participate in PvP when prevent pvp is enabled
260+
+ essentials.protect.damage.disable:
261+
+ description: Allows the bearer to not take damage
262+
+ essentials.protect.damage.contact:
263+
+ description: Allows the bearer to take damage from cacti and other contact damage
264+
+ essentials.protect.damage.lava:
265+
+ description: Allows the bearer to take damage from lava
266+
+ essentials.protect.damage.tnt:
267+
+ description: Allows the bearer to take damage from TNT
268+
+ essentials.protect.damage.creeper:
269+
+ description: Allows the bearer to take damage from creepers
270+
+ essentials.protect.damage.fireball:
271+
+ description: Allows the bearer to take damage from fireballs
272+
+ essentials.protect.damage.witherskull:
273+
+ description: Allows the bearer to take damage from wither skulls
274+
+ essentials.protect.damage.tnt-minecraft:
275+
+ description: Allows the bearer to take damage from a tnt minecart
276+
+ essentials.protect.damage.projectiles:
277+
+ description: Allows the bearer to take damage from projectiles
278+
+ essentials.protect.damage.fall:
279+
+ description: Allows the bearer to take fall damage
280+
+ essentials.protect.damage.suffocation:
281+
+ description: Allows the bearer to take suffocation damage
282+
+ essentials.protect.damage.fire:
283+
+ description: Allows the bearer to take fire damage
284+
+ essentials.protect.damage.drowning:
285+
+ description: Allows the bearer to take drowning damage
286+
+ essentials.protect.damage.lightning:
287+
+ description: Allows the bearer to take lightning damage
288+
+ essentials.protect.damage.wither:
289+
+ description: Allows the bearer to take wither damage
97290
+folia-supported: true
98291
\ No newline at end of file
99292
diff --git a/EssentialsSpawn/src/main/resources/plugin.yml b/EssentialsSpawn/src/main/resources/plugin.yml
@@ -121,7 +314,7 @@ index e267ef5e0..20253d017 100644
121314
setxmpp:
122315
description: Sets your XMPP address.
123316
diff --git a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts
124-
index 474b30f1b..3737bf057 100644
317+
index b338a65be..bcce1ccc3 100644
125318
--- a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts
126319
+++ b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts
127320
@@ -77,7 +77,7 @@ afterEvaluate {
@@ -147,5 +340,5 @@ index 566f22925..8c006bfc5 100644
147340
project.ext {
148341
GIT_COMMIT = !indraGit.isPresent() ? "unknown" : indraGit.commit().abbreviate(7).name()
149342
--
150-
2.50.1.windows.1
343+
2.52.0.windows.1
151344

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 c2e75b7518a1ccd6d0244ae8133a609b7d6d0e85 Mon Sep 17 00:00:00 2001
1+
From 4fe79c327a80cf1d689fb1075830932c16e07e99 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Tue, 2 Dec 2025 11:58:15 +0100
3+
Date: Wed, 17 Dec 2025 17:49:20 +0100
44
Subject: [PATCH 02/14] Teleport to teleportAsync
55

66
---
@@ -49,5 +49,5 @@ index b5e687f25..f691d30d8 100644
4949
if (ess.getSettings().isTeleportToCenterLocation()) {
5050
loc = LocationUtil.getRoundedDestination(loc);
5151
--
52-
2.50.1.windows.1
52+
2.52.0.windows.1
5353

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

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

66
---
@@ -11,7 +11,7 @@ Subject: [PATCH 03/14] Replace BukkitRunnable to FoliaRunnable
1111

1212
diff --git a/Essentials/src/main/java/com/earth2me/essentials/api/FoliaRunnable.java b/Essentials/src/main/java/com/earth2me/essentials/api/FoliaRunnable.java
1313
new file mode 100644
14-
index 000000000..aef3baf48
14+
index 000000000..cc2ec820e
1515
--- /dev/null
1616
+++ b/Essentials/src/main/java/com/earth2me/essentials/api/FoliaRunnable.java
1717
@@ -0,0 +1,271 @@
@@ -318,5 +318,5 @@ index fa97ff2ff..09c710b3f 100644
318318
this.sound = sound;
319319
this.players = players;
320320
--
321-
2.50.1.windows.1
321+
2.52.0.windows.1
322322

patches/plugins/0004-Replace-scheduler.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 05050f8b2af0cf1e845a9c0d3288e24357a56567 Mon Sep 17 00:00:00 2001
1+
From daacee716e6e209d49da191a040eb06c18cc96d2 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Tue, 2 Dec 2025 11:58:16 +0100
3+
Date: Wed, 17 Dec 2025 17:49:21 +0100
44
Subject: [PATCH 04/14] Replace scheduler
55

66
---
@@ -1162,5 +1162,5 @@ index a5199f921..13e90a733 100644
11621162
parent.getServer().dispatchCommand(Console.getInstance().getCommandSender(), message.substring(1));
11631163
} catch (final Exception ex) {
11641164
--
1165-
2.50.1.windows.1
1165+
2.52.0.windows.1
11661166

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 99280940cfde01296be0107c6ec24e2f9b27325f Mon Sep 17 00:00:00 2001
1+
From 3a08a35d1135e89e349eef58fad4d371169d5d37 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Tue, 2 Dec 2025 11:58:16 +0100
3+
Date: Wed, 17 Dec 2025 17:49:22 +0100
44
Subject: [PATCH 05/14] Fix command time
55

66
---
@@ -59,5 +59,5 @@ index 4e85d7b4c..2002335f8 100644
5959

6060
private void getWorldsTime(final CommandSource sender, final Collection<World> worlds) {
6161
--
62-
2.50.1.windows.1
62+
2.52.0.windows.1
6363

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 09fc7e33568707938df5482b19fac6cb03f3ef57 Mon Sep 17 00:00:00 2001
1+
From 0315f92a3a66fa50a5a98d5bf792a39911fc95e5 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <bierque.euphyllia@gmail.com>
3-
Date: Tue, 2 Dec 2025 11:58:16 +0100
3+
Date: Wed, 17 Dec 2025 17:49:22 +0100
44
Subject: [PATCH 06/14] Fix dispatch command
55

66
---
@@ -51,5 +51,5 @@ index e32ade33e..a33e714e9 100644
5151
if (spew) {
5252
user.sendTl("kitInvFull");
5353
--
54-
2.50.1.windows.1
54+
2.52.0.windows.1
5555

0 commit comments

Comments
 (0)