Fix composite punishments not being detected (#9)

plan-player-analytics · Mar 20, 2024 · e4b7f4d · e4b7f4d
1 parent c36caac
commit e4b7f4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/net/playeranalytics/extension/libertybans/LibertyBansExtension.java b/src/main/java/net/playeranalytics/extension/libertybans/LibertyBansExtension.java
@@ -35,6 +35,7 @@ of this software and associated documentation files(the "Software"), to deal
 import com.djrapitops.plan.query.QueryService;
 import space.arim.libertybans.api.*;
 import space.arim.libertybans.api.punish.Punishment;
+import space.arim.libertybans.api.select.SelectionPredicate;
 import space.arim.libertybans.api.select.SortPunishments;
 import space.arim.omnibus.Omnibus;
 import space.arim.omnibus.OmnibusProvider;
@@ -52,7 +53,8 @@ public class LibertyBansExtension implements DataExtension {
 
     private LibertyBans api;
 
-    public LibertyBansExtension() {}
+    public LibertyBansExtension() {
+    }
 
     @Override
     public CallEvents[] callExtensionMethodsOn() {
@@ -76,7 +78,12 @@ private Optional<Punishment> punishment(UUID playerUUID, PunishmentType type) {
         return api()
                 .getSelector()
                 .selectionBuilder()
-                .victim(PlayerVictim.of(playerUUID))
+                .victims(
+                        SelectionPredicate.matchingAnyOf(
+                                PlayerVictim.of(playerUUID),
+                                CompositeVictim.of(playerUUID, CompositeVictim.WILDCARD_ADDRESS)
+                        )
+                )
                 .type(type)
                 .build()
                 .getFirstSpecificPunishment(SortPunishments.LATEST_END_DATE_FIRST)

diff --git a/src/main/java/net/playeranalytics/extension/libertybans/LibertyBansListener.java b/src/main/java/net/playeranalytics/extension/libertybans/LibertyBansListener.java
@@ -1,6 +1,7 @@
 package net.playeranalytics.extension.libertybans;
 
 import com.djrapitops.plan.extension.Caller;
+import space.arim.libertybans.api.CompositeVictim;
 import space.arim.libertybans.api.PlayerVictim;
 import space.arim.libertybans.api.Victim;
 import space.arim.libertybans.api.event.PostPardonEvent;
@@ -38,6 +39,8 @@ private void actOnPunishment(Punishment punishment) {
         Victim victim = punishment.getVictim();
         if (victim instanceof PlayerVictim) {
             caller.updatePlayerData(((PlayerVictim) victim).getUUID(), null);
+        }   else if (victim instanceof CompositeVictim) {
+            caller.updatePlayerData(((CompositeVictim) victim).getUUID(), null);
         }
     }
 }