Ensure other forms of inventory close requests do not call listener during a pending dispatch

Author: Muqsit

src/muqsit/invmenu/InvMenuEventHandler.php

@@ -81,10 +81,13 @@ public function onInventoryClose(InventoryCloseEvent $event) : void{
 
 		$current = $session->current;
 		if($current !== null && $event->getInventory() === $current->menu->getInventory()){
-			$current?->graphic->remove($player);
+			$current->graphic->remove($player);
 			$session->current = null;
 		}
 		$session->network->wait(PlayerNetwork::DELAY_TYPE_ANIMATION_WAIT, static fn($success) => false);
+		if($session->dispatcher !== null && $session->dispatcher->state === PlayerWindowDispatcher::STATE_SENDING && $session->dispatcher->info === $current){
+			return;
+		}
 		$current?->menu->onClose($player);
 	}
 

src/muqsit/invmenu/session/PlayerSession.php

@@ -21,12 +21,13 @@ public function __construct(
 	 * @internal
 	 */
 	public function finalize() : void{
+		$this->network->finalize();
+		$this->dispatcher?->finalize(); // dispatcher finalized first, it has authority to nullify current
+		$this->dispatcher = null;
 		if($this->current !== null){
 			$this->current->graphic->remove($this->player);
 			$this->player->removeCurrentWindow();
+			$this->current = null;
 		}
-		$this->network->finalize();
-		$this->dispatcher?->finalize();
-		$this->dispatcher = null;
 	}
 }