Merge branch 'trunk' into renovate/mcmmo

Hexaoxide · Jun 12, 2024 · 4c3f4b4 · 4c3f4b4
2 parents c2aeaf3 + 5c6fe73
commit 4c3f4b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -37,11 +37,11 @@ adventurePlatformFabric = "5.12.0"
 luckPermsApi = "5.4"
 essentialsx = "2.20.1"
 discordsrv = "1.26.0"
-placeholderapi = "2.11.5"
+placeholderapi = "2.11.6"
 miniplaceholders = "2.2.3"
 jdbi = "3.45.1"
 hikari = "5.1.0"
-mysql = "8.3.0"
+mysql = "8.4.0"
 flyway = "10.12.0"
 caffeine = "3.1.8"
 mariadb = "3.3.3"
@@ -52,8 +52,8 @@ postgresql = "42.7.3"
 rabbitmq = "5.21.0"
 nats = "2.17.6"
 h2 = "2.2.224"
-towny = "0.100.0.9"
 mcmmo = "2.1.227"
+towny = "0.100.3.0"
 fuuid = "1.6.9.5-U0.6.33"
 
 # synced with version used by lowest supported mc (currently 1.20.4 on paper)

diff --git a/paper/src/main/java/net/draycia/carbon/paper/messages/PlaceholderAPIMiniMessageParser.java b/paper/src/main/java/net/draycia/carbon/paper/messages/PlaceholderAPIMiniMessageParser.java
@@ -70,17 +70,17 @@ public Component parse(final OfflinePlayer player, final String input) {
         return this.parse(player, input, TagResolver.empty());
     }
 
-    public Component parseRelational(final Player one, final Player two, final String input, final TagResolver tagResolver) {
+    public Component parseRelational(final Player recipient, final Player sender, final String input, final TagResolver tagResolver) {
         return this.parse(
             PlaceholderAPI.getPlaceholderPattern(),
-            match -> PlaceholderAPI.setPlaceholders(one, PlaceholderAPI.setRelationalPlaceholders(two, one, match)),
+            match -> PlaceholderAPI.setPlaceholders(sender, PlaceholderAPI.setRelationalPlaceholders(recipient, sender, match)),
             input,
             tagResolver
         );
     }
 
-    public Component parseRelational(final Player one, final Player two, final String input) {
-        return this.parseRelational(one, two, input, TagResolver.empty());
+    public Component parseRelational(final Player recipient, final Player sender, final String input) {
+        return this.parseRelational(recipient, sender, input, TagResolver.empty());
     }
 
     private Component parse(