From 3e5d3a646b9fa8d2a31eabd5f9f22357f0aa603b Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Mon, 23 Mar 2020 21:28:38 +0000
Subject: [PATCH] Make use of BadPacketException::wrap()

---
 src/network/mcpe/NetworkSession.php              | 8 ++++----
 src/network/mcpe/handler/InGamePacketHandler.php | 6 +++---
 src/network/mcpe/protocol/AddActorPacket.php     | 2 +-
 src/network/mcpe/protocol/CraftingDataPacket.php | 2 +-
 src/network/mcpe/protocol/DataPacket.php         | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php
index 0925f1249..205dd01ad 100644
--- a/src/network/mcpe/NetworkSession.php
+++ b/src/network/mcpe/NetworkSession.php
@@ -271,7 +271,7 @@ class NetworkSession{
 				$payload = $this->cipher->decrypt($payload);
 			}catch(\UnexpectedValueException $e){
 				$this->logger->debug("Encrypted packet: " . base64_encode($payload));
-				throw new BadPacketException("Packet decryption error: " . $e->getMessage(), 0, $e);
+				throw BadPacketException::wrap($e, "Packet decryption error");
 			}finally{
 				Timings::$playerNetworkReceiveDecryptTimer->stopTiming();
 			}
@@ -283,7 +283,7 @@ class NetworkSession{
 		}catch(\ErrorException $e){
 			$this->logger->debug("Failed to decompress packet: " . base64_encode($payload));
 			//TODO: this isn't incompatible game version if we already established protocol version
-			throw new BadPacketException("Compressed packet batch decode error: " . $e->getMessage(), 0, $e);
+			throw BadPacketException::wrap($e, "Compressed packet batch decode error");
 		}finally{
 			Timings::$playerNetworkReceiveDecompressTimer->stopTiming();
 		}
@@ -297,14 +297,14 @@ class NetworkSession{
 				$pk = $stream->getPacket();
 			}catch(BinaryDataException $e){
 				$this->logger->debug("Packet batch: " . base64_encode($stream->getBuffer()));
-				throw new BadPacketException("Packet batch decode error: " . $e->getMessage(), 0, $e);
+				throw BadPacketException::wrap($e, "Packet batch decode error");
 			}
 
 			try{
 				$this->handleDataPacket($pk);
 			}catch(BadPacketException $e){
 				$this->logger->debug($pk->getName() . ": " . base64_encode($pk->getBinaryStream()->getBuffer()));
-				throw new BadPacketException("Error processing " . $pk->getName() . ": " . $e->getMessage(), 0, $e);
+				throw BadPacketException::wrap($e, "Error processing " . $pk->getName());
 			}
 		}
 	}
diff --git a/src/network/mcpe/handler/InGamePacketHandler.php b/src/network/mcpe/handler/InGamePacketHandler.php
index 165a3250d..b04e97ce1 100644
--- a/src/network/mcpe/handler/InGamePacketHandler.php
+++ b/src/network/mcpe/handler/InGamePacketHandler.php
@@ -544,7 +544,7 @@ class InGamePacketHandler extends PacketHandler{
 			$offset = 0;
 			$nbt = (new NetworkNbtSerializer())->read($packet->namedtag, $offset, 512)->mustGetCompoundTag();
 		}catch(NbtDataException $e){
-			throw new BadPacketException($e->getMessage(), 0, $e);
+			throw BadPacketException::wrap($e);
 		}
 
 		if($block instanceof Sign){
@@ -552,7 +552,7 @@ class InGamePacketHandler extends PacketHandler{
 				try{
 					$text = SignText::fromBlob($nbt->getString("Text"));
 				}catch(\InvalidArgumentException $e){
-					throw new BadPacketException("Invalid sign text update: " . $e->getMessage(), 0, $e);
+					throw BadPacketException::wrap($e, "Invalid sign text update");
 				}
 
 				try{
@@ -560,7 +560,7 @@ class InGamePacketHandler extends PacketHandler{
 						$this->player->getWorld()->sendBlocks([$this->player], [$pos]);
 					}
 				}catch(\UnexpectedValueException $e){
-					throw new BadPacketException($e->getMessage(), 0, $e);
+					throw BadPacketException::wrap($e);
 				}
 
 				return true;
diff --git a/src/network/mcpe/protocol/AddActorPacket.php b/src/network/mcpe/protocol/AddActorPacket.php
index 7a78010d8..815b1743a 100644
--- a/src/network/mcpe/protocol/AddActorPacket.php
+++ b/src/network/mcpe/protocol/AddActorPacket.php
@@ -198,7 +198,7 @@ class AddActorPacket extends DataPacket implements ClientboundPacket{
 					$attr->setMaxValue($max);
 					$attr->setValue($current);
 				}catch(\InvalidArgumentException $e){
-					throw new BadPacketException($e->getMessage(), 0, $e); //TODO: address this properly
+					throw BadPacketException::wrap($e); //TODO: address this properly
 				}
 				$this->attributes[] = $attr;
 			}else{
diff --git a/src/network/mcpe/protocol/CraftingDataPacket.php b/src/network/mcpe/protocol/CraftingDataPacket.php
index cd068fedd..af504e8ed 100644
--- a/src/network/mcpe/protocol/CraftingDataPacket.php
+++ b/src/network/mcpe/protocol/CraftingDataPacket.php
@@ -128,7 +128,7 @@ class CraftingDataPacket extends DataPacket implements ClientboundPacket{
 					try{
 						$entry["input"] = ItemFactory::get($inputId, $inputData);
 					}catch(\InvalidArgumentException $e){
-						throw new BadPacketException($e->getMessage(), 0, $e);
+						throw BadPacketException::wrap($e);
 					}
 					$entry["output"] = $out = $in->getSlot();
 					if($out->getMeta() === 0x7fff){
diff --git a/src/network/mcpe/protocol/DataPacket.php b/src/network/mcpe/protocol/DataPacket.php
index f45b35d74..0d5601cc0 100644
--- a/src/network/mcpe/protocol/DataPacket.php
+++ b/src/network/mcpe/protocol/DataPacket.php
@@ -82,7 +82,7 @@ abstract class DataPacket implements Packet{
 			$this->decodeHeader($this->buf);
 			$this->decodePayload($this->buf);
 		}catch(BinaryDataException | BadPacketException $e){
-			throw new BadPacketException($this->getName() . ": " . $e->getMessage(), 0, $e);
+			throw BadPacketException::wrap($e, $this->getName());
 		}
 	}