From ead3ba76bcd4c72807eb476f3ef7fc4ff4528147 Mon Sep 17 00:00:00 2001
From: FluxCapacitor2 <31071265+FluxCapacitor2@users.noreply.github.com>
Date: Sun, 10 Mar 2024 22:27:35 -0400
Subject: [PATCH] Add more logging when event filtering fails

---
 .../kotlin/com/bluedragonmc/server/Game.kt    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/common/src/main/kotlin/com/bluedragonmc/server/Game.kt b/common/src/main/kotlin/com/bluedragonmc/server/Game.kt
index 80f1cabf..b6277718 100644
--- a/common/src/main/kotlin/com/bluedragonmc/server/Game.kt
+++ b/common/src/main/kotlin/com/bluedragonmc/server/Game.kt
@@ -99,13 +99,19 @@ abstract class Game(val name: String, val mapName: String, val mode: String? = n
         }
 
     protected val eventNode = EventNode.event("$name-$mapName-$mode", EventFilter.ALL) { event ->
-        when (event) {
-            is InstanceEvent -> ownsInstance(event.instance)
-            is GameEvent -> event.game === this
-            is PlayerSpawnEvent -> ownsInstance(event.spawnInstance) // Workaround for PlayerSpawnEvent not being an InstanceEvent
-            is PlayerEvent -> event.player.isActive && ownsInstance(event.player.instance ?: return@event false)
-            is ServerTickMonitorEvent -> true
-            else -> false
+        try {
+            when (event) {
+                is InstanceEvent -> ownsInstance(event.instance)
+                is GameEvent -> event.game === this
+                is PlayerSpawnEvent -> ownsInstance(event.spawnInstance) // Workaround for PlayerSpawnEvent not being an InstanceEvent
+                is PlayerEvent -> event.player.isActive && ownsInstance(event.player.instance ?: return@event false)
+                is ServerTickMonitorEvent -> true
+                else -> false
+            }
+        } catch (e: Exception) {
+            logger.error("Error while filtering event $event")
+            e.printStackTrace()
+            return@event false
         }
     }