Fix NPE on cause filter before tracker load (#1418)

Signed-off-by: Pablo Herrera <pabloherrerapalacio@gmail.com>
PGMDev · Oct 30, 2024 · 584112a · 584112a
1 parent a59a484
commit 584112a
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/filters/matcher/CauseFilter.java b/core/src/main/java/tc/oc/pgm/filters/matcher/CauseFilter.java
@@ -77,14 +77,12 @@ public boolean matches(MatchQuery query) {
       event = ((GeneralizedEvent) event).getCause();
     }
 
-    TrackerMatchModule tracker = query.moduleRequire(TrackerMatchModule.class);
-
     EntityDamageEvent.DamageCause damageCause = null;
     DamageInfo damageInfo = null;
     boolean punchDamage = false;
     if (event instanceof EntityDamageEvent damageEvent) {
       damageCause = damageEvent.getCause();
-      damageInfo = tracker.resolveDamage(damageEvent);
+      damageInfo = query.moduleRequire(TrackerMatchModule.class).resolveDamage(damageEvent);
       if (damageInfo instanceof MeleeInfo) {
         PhysicalInfo weapon = ((MeleeInfo) damageInfo).getWeapon();
         if (weapon instanceof ItemInfo && ((ItemInfo) weapon).getItem().getType() == Material.AIR) {