mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-12 22:45:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mcpe-1.0.3.0

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-02-01 18:15:08 +00:00
commit 06dd410340
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/network/RakLibInterface.php
View File

@ -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); $this->network->unregisterInterface($this);
throw new \Exception("RakLib Thread crashed"); throw new \Exception("RakLib Thread crashed");

1
src/pocketmine/network/protocol/LoginPacket.php
View File

@ -44,6 +44,7 @@ class LoginPacket extends DataPacket{
$this->protocol = $this->getInt(); $this->protocol = $this->getInt();
if($this->protocol !== Info::CURRENT_PROTOCOL){ if($this->protocol !== Info::CURRENT_PROTOCOL){
$this->buffer = null;
return; //Do not attempt to decode for non-accepted protocols return; //Do not attempt to decode for non-accepted protocols
} }

2
src/raklib

@ -1 +1 @@
Subproject commit f4bfcb8e6b7cf93f3961dd8fc9c5ba44ce068763 Subproject commit 989ad8198cb5dd9b463a03831c1332e4cea60858