Fix dead players interacting with specific packets

Signed-off-by: Pablo Herrera <[email protected]>
PGMDev · May 3, 2024 · 830c38f · 830c38f
1 parent 4714177
commit 830c38f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/src/main/java/tc/oc/pgm/api/player/MatchPlayerState.java b/core/src/main/java/tc/oc/pgm/api/player/MatchPlayerState.java
@@ -76,4 +76,9 @@ public interface MatchPlayerState extends Audience, Named {
   default boolean isPlayer(MatchPlayer player) {
     return getPlayer().map(player::equals).orElse(false);
   }
+
+  /** @return if the player can interact */
+  default boolean canInteract() {
+    return getPlayer().map(MatchPlayer::canInteract).orElse(false);
+  }
 }
diff --git a/core/src/main/java/tc/oc/pgm/modules/EventFilterMatchModule.java b/core/src/main/java/tc/oc/pgm/modules/EventFilterMatchModule.java
@@ -116,7 +116,7 @@ boolean cancelUnlessInteracting(Cancellable event, Entity entity) {
 
   boolean cancelUnlessInteracting(Cancellable event, MatchPlayerState player) {
     return cancel(
-        event, !player.getParty().isParticipating(), player.getMatch().getWorld(), null, null);
+        event, !player.canInteract(), player.getMatch().getWorld(), null, null);
   }
 
   ClickType convertClick(ClickType clickType, Player player) {