Merge branch 'next-minor' into next-major

changelogs/4.8.md

@@ -7,8 +7,17 @@ Plugin developers should **only** update their required API to this version if y
 **WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do.
 
 # 4.8.0
-Released 9th August 2022.
+Released 24th August 2022.
 
 ## General
 - Added support for Minecraft: Bedrock Edition 1.19.21.
 - Removed support for older versions.
+
+# 4.8.1
+Released 26th August 2022.
+
+## General
+- Crashdumps now include JIT mode information for use by the Crash Archive.
+
+## Fixes
+- Fixed uninitialized offset error in `DyeColorIdMap` when given invalid dye color IDs.

src/data/bedrock/DyeColorIdMap.php

@@ -93,7 +93,7 @@ final class DyeColorIdMap{
 	}
 
 	public function fromId(int $id) : ?DyeColor{
-		return $this->idToEnum[$id];
+		return $this->idToEnum[$id] ?? null;
 	}
 
 	public function fromInvertedId(int $id) : ?DyeColor{

src/network/mcpe/InventoryManager.php

@@ -331,8 +331,10 @@ class InventoryManager{
 
 	public function onClientRemoveWindow(int $id) : void{
 		if($id === $this->lastInventoryNetworkId){
-			$this->remove($id);
-			$this->player->removeCurrentWindow();
+			if($id !== $this->pendingCloseWindowId){
+				$this->remove($id);
+				$this->player->removeCurrentWindow();
+			}
 		}else{
 			$this->session->getLogger()->debug("Attempted to close inventory with network ID $id, but current is $this->lastInventoryNetworkId");
 		}