diff --git a/src/pocketmine/network/RakLibInterface.php b/src/pocketmine/network/RakLibInterface.php index 7ff61e331..72f4fd392 100644 --- a/src/pocketmine/network/RakLibInterface.php +++ b/src/pocketmine/network/RakLibInterface.php @@ -77,7 +77,7 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{ } } - if($this->rakLib->isTerminated()){ + if(!$this->rakLib->isRunning() and !$this->rakLib->isShutdown()){ $this->network->unregisterInterface($this); throw new \Exception("RakLib Thread crashed"); diff --git a/src/pocketmine/network/protocol/LoginPacket.php b/src/pocketmine/network/protocol/LoginPacket.php index d8487eae5..e293b135a 100644 --- a/src/pocketmine/network/protocol/LoginPacket.php +++ b/src/pocketmine/network/protocol/LoginPacket.php @@ -44,6 +44,7 @@ class LoginPacket extends DataPacket{ $this->protocol = $this->getInt(); if($this->protocol !== Info::CURRENT_PROTOCOL){ + $this->buffer = null; return; //Do not attempt to decode for non-accepted protocols } diff --git a/src/raklib b/src/raklib index f4bfcb8e6..989ad8198 160000 --- a/src/raklib +++ b/src/raklib @@ -1 +1 @@ -Subproject commit f4bfcb8e6b7cf93f3961dd8fc9c5ba44ce068763 +Subproject commit 989ad8198cb5dd9b463a03831c1332e4cea60858