From c2b677759b905d6eb3ebcefcec2cb04eb38436bb Mon Sep 17 00:00:00 2001
From: DD <didinele.dev@gmail.com>
Date: Mon, 10 Oct 2022 20:15:04 +0300
Subject: [PATCH] fix(WebSocketShard): dispatch race condition (#8731)

---
 packages/ws/src/ws/WebSocketShard.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/ws/src/ws/WebSocketShard.ts b/packages/ws/src/ws/WebSocketShard.ts
index 48f671f3136c..e78ec14e1e12 100644
--- a/packages/ws/src/ws/WebSocketShard.ts
+++ b/packages/ws/src/ws/WebSocketShard.ts
@@ -383,10 +383,6 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
 
 		switch (payload.op) {
 			case GatewayOpcodes.Dispatch: {
-				if (this.status === WebSocketShardStatus.Ready || this.status === WebSocketShardStatus.Resuming) {
-					this.emit(WebSocketShardEvents.Dispatch, { data: payload });
-				}
-
 				if (this.status === WebSocketShardStatus.Resuming) {
 					this.replayedEvents++;
 				}
@@ -425,6 +421,8 @@ export class WebSocketShard extends AsyncEventEmitter<WebSocketShardEventsMap> {
 					await this.strategy.updateSessionInfo(this.id, this.session);
 				}
 
+				this.emit(WebSocketShardEvents.Dispatch, { data: payload });
+
 				break;
 			}