Minor fixes.

Retro-Rewind-Team · Oct 9, 2024 · 7b8881b · 7b8881b
1 parent 057e0d2
commit 7b8881b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/payload/import/mkw/net/net.hpp b/payload/import/mkw/net/net.hpp
@@ -147,7 +147,7 @@ class NetController
         case JoinType::WorldwideBattle:
         case JoinType::FriendWorldwideVersusRace:
         case JoinType::FriendWorldwideBattle: {
-            return true;
+            return false;
         }
         case JoinType::ContinentalVersusRace:
         case JoinType::ContinentalBattle:

diff --git a/payload/wwfcSecurity.cpp b/payload/wwfcSecurity.cpp
@@ -5,9 +5,7 @@
 #include "import/mkw/net/selectHandler.hpp"
 #include "import/mkw/net/userHandler.hpp"
 #include "import/mkw/registry.hpp"
-#include "import/mkw/system/raceConfig.hpp"
 #include "import/mkw/system/system.hpp"
-#include "wwfcLog.hpp"
 #include "wwfcPatch.hpp"
 
 namespace wwfc::Security
@@ -238,7 +236,6 @@ static bool IsHeaderPacketDataValid(
     const void* /* packet */, u8 /* packetSize */, u8 /* playerAid */
 )
 {
-    // This packet is validated by the function 'IsRacePacketValid'
     return true;
 }
 
@@ -253,6 +250,10 @@ static bool IsMatchHeaderPacketDataValid(
     const MatchHeaderHandler::Packet* matchHeaderPacket =
         reinterpret_cast<const MatchHeaderHandler::Packet*>(packet);
 
+    if (!NetController::Instance()->inVanillaRaceScene()) {
+        return true;
+    }
+
     RaceConfig::Scenario* scenario = &RaceConfig::Instance()->raceScenario();
 
     for (size_t n = 0;
@@ -281,6 +282,21 @@ static bool IsMatchHeaderPacketDataValid(
         }
     }
 
+    MatchHeaderHandler::Packet::Course currentCourse =
+        matchHeaderPacket->course;
+    if (currentCourse != MatchHeaderHandler::Packet::Course::None) {
+        Course course = static_cast<Course>(currentCourse);
+        if (scenario->isOnlineVersusRace()) {
+            if (!IsRaceCourse(course)) {
+                return false;
+            }
+        } else /* if (scenario->isOnlineBattle()) */ {
+            if (!IsBattleCourse(course)) {
+                return false;
+            }
+        }
+    }
+
     return true;
 }
 
@@ -479,8 +495,9 @@ IsItemPacketDataValid(const void* packet, u8 packetSize, u8 /* playerAid */)
     return true;
 }
 
-static bool
-IsEventPacketDataValid(const void* packet, u8 packetSize, u8 playerAid)
+static bool IsEventPacketDataValid(
+    const void* packet, u8 packetSize, u8 /* playerAid */
+)
 {
     using namespace mkw::System;
 
@@ -496,15 +513,15 @@ IsEventPacketDataValid(const void* packet, u8 packetSize, u8 playerAid)
     // Always ensure that the packet does not contain any invalid item
     // objects, as this can cause a buffer overflow to occur.
     if (eventPacket->containsInvalidItemObject()) {
-        return false;
+        return true;
     }
 
     if (!NetController::Instance()->inVanillaMatch()) {
         return true;
     }
 
-    if (!eventPacket->isValid(packetSize, playerAid)) {
-        return false;
+    if (!eventPacket->isValid(packetSize)) {
+        return true;
     }
 
     return true;