Reverse sender/recipient in relational placeholders

Hexaoxide · May 14, 2024 · af12f92 · af12f92
1 parent 8c92f0f
commit af12f92
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/fabric/src/main/java/net/draycia/carbon/fabric/FabricMessageRenderer.java b/fabric/src/main/java/net/draycia/carbon/fabric/FabricMessageRenderer.java
@@ -70,7 +70,7 @@ public Component render(
                 if (sourced.sender() instanceof CarbonPlayerFabric sender) {
                     tagResolver.resolver(MiniPlaceholders.getAudiencePlaceholders(sender));
                     if (sourced.recipient() instanceof CarbonPlayerFabric recipient && recipient.online()) {
-                        tagResolver.resolver(MiniPlaceholders.getRelationalPlaceholders(sender, recipient));
+                        tagResolver.resolver(MiniPlaceholders.getRelationalPlaceholders(recipient, sender));
                     }
                 } else if (sourced.sender() instanceof ConsoleCarbonPlayer console) {
                     // I don't know if this will ever actually resolve anything, or if anything supports console audience

diff --git a/paper/src/main/java/net/draycia/carbon/paper/messages/PaperMessageRenderer.java b/paper/src/main/java/net/draycia/carbon/paper/messages/PaperMessageRenderer.java
@@ -123,13 +123,13 @@ public Component render(
 
         if (MiniPlaceholdersExpansion.miniPlaceholdersLoaded()) {
             tagResolver.resolver(MiniPlaceholders.getRelationalPlaceholders(
-                senderBukkitPlayer,
-                recipientBukkitPlayer
+                recipientBukkitPlayer,
+                senderBukkitPlayer
             ));
         }
         if (this.hasPlaceholderAPI()) {
-            return this.placeholderApiProcessor.get().parseRelational(senderBukkitPlayer,
-                recipientBukkitPlayer, placeholderResolvedMessage, tagResolver.build());
+            return this.placeholderApiProcessor.get().parseRelational(recipientBukkitPlayer,
+                senderBukkitPlayer, placeholderResolvedMessage, tagResolver.build());
         }
 
         return this.miniMessage.deserialize(placeholderResolvedMessage, tagResolver.build());

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
@@ -73,7 +73,7 @@ public Component parse(final OfflinePlayer player, final String input) {
     public Component parseRelational(final Player one, final Player two, final String input, final TagResolver tagResolver) {
         return this.parse(
             PlaceholderAPI.getPlaceholderPattern(),
-            match -> PlaceholderAPI.setPlaceholders(one, PlaceholderAPI.setRelationalPlaceholders(one, two, match)),
+            match -> PlaceholderAPI.setPlaceholders(one, PlaceholderAPI.setRelationalPlaceholders(two, one, match)),
             input,
             tagResolver
         );

diff --git a/velocity/src/main/java/net/draycia/carbon/velocity/VelocityMessageRenderer.java b/velocity/src/main/java/net/draycia/carbon/velocity/VelocityMessageRenderer.java
@@ -72,7 +72,7 @@ public Component render(
                 if (sourced.sender() instanceof CarbonPlayerVelocity sender) {
                     tagResolver.resolver(MiniPlaceholders.getAudiencePlaceholders(sender));
                     if (sourced.recipient() instanceof CarbonPlayerVelocity recipient) {
-                        tagResolver.resolver(MiniPlaceholders.getRelationalGlobalPlaceholders(sender, recipient));
+                        tagResolver.resolver(MiniPlaceholders.getRelationalGlobalPlaceholders(recipient, sender));
                     }
                 } else if (sourced.sender() instanceof ConsoleCarbonPlayer console) {
                     // I don't know if this will ever actually resolve anything, or if anything supports console audience