From c564e77b9f7a5058b1548dd689a23f7f551a9756 Mon Sep 17 00:00:00 2001 From: ANR2ME Date: Fri, 4 Sep 2020 16:08:07 +0700 Subject: [PATCH] Fix AdhocMatching P2P Mode. This fix Bleach Heat the Soul 7 --- Core/HLE/sceNetAdhoc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index 8af2249f3d..e06b64cec6 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -5437,9 +5437,9 @@ void actOnHelloPacket(SceNetAdhocMatchingContext * context, SceNetEtherAddr * se } // Peer available now - if (peer != NULL) + if (peer != NULL && peer->state != PSP_ADHOC_MATCHING_PEER_OUTGOING_REQUEST && peer->state != PSP_ADHOC_MATCHING_PEER_INCOMING_REQUEST) { - // Spawn Hello Event + // Spawn Hello Event. FIXME: HELLO event should not be triggered in the middle of joining? This will cause Bleach 7 to Cancel the join request spawnLocalEvent(context, PSP_ADHOC_MATCHING_EVENT_HELLO, sendermac, optlen, opt); } }