Fixed that fursuits of old events can be catched

+ Removed another occurences of the faulty function for filtering for an event

Author: TLTimeplex

app/Domain/CatchEmAll/Controllers/GameController.php

@@ -38,7 +38,7 @@ public function index(Request $request)
 
         // Get current event
         $currentEvent = $this->getCurrentEvent();
-        $filterEvent = $this->getFilterEvent($selectedEventId, $isGlobal, $currentEvent);
+        $filterEvent = $currentEvent; //$this->getFilterEvent($selectedEventId, $isGlobal, $currentEvent);
 
         // Get user's game stats
         $gameStats = $this->gameStatsService->getUserStats($user, $filterEvent, $isGlobal);
@@ -67,7 +67,7 @@ public function index(Request $request)
             'collection' => $collection,
             'achievements' => $achievements,
             'eventsWithEntries' => $eventsWithEntries,
-            'selectedEvent' => $selectedEventId ?: ($filterEvent?->id ?? 'global'),
+            'selectedEvent' => $filterEvent?->id ?? 'global',
             'isGlobal' => $isGlobal,
             'recentCatch' => $recentCatch,
         ]);
@@ -99,7 +99,10 @@ public function catch(UserCatchRequest $request)
             ->where('code', $catchCode)
             ->first();
 
-        $fursuit = $this->findFursuitByCode($catchCode);
+        $fursuit = Fursuit::where('event_id', $event->id)
+            ->where('catch_code', $catchCode)
+            ->where('catch_em_all', true)
+            ->first();
 
         // If neither exists, it's an invalid code
         if (!$specialCode && !$fursuit) {
@@ -361,13 +364,6 @@ private function createCatchLog($event, $user, $catchCode): UserCatchLog
         ]);
     }
 
-    private function findFursuitByCode(string $code): ?Fursuit
-    {
-        return Fursuit::where('catch_code', $code)
-            ->where('catch_em_all', true)
-            ->first();
-    }
-
     private function isRateLimited(int $userId): int
     {
         $key = "fursuit_catch:{$userId}";