mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-20 18:34:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.3' into release/3.4

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-12-01 10:09:46 +00:00
commit 75482124f2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pocketmine/Server.php
View File

@ -91,7 +91,6 @@ use pocketmine\plugin\PluginManager;
use pocketmine\plugin\ScriptPluginLoader; use pocketmine\plugin\ScriptPluginLoader;
use pocketmine\resourcepacks\ResourcePackManager; use pocketmine\resourcepacks\ResourcePackManager;
use pocketmine\scheduler\AsyncPool; use pocketmine\scheduler\AsyncPool;
use pocketmine\scheduler\FileWriteTask;
use pocketmine\scheduler\SendUsageTask; use pocketmine\scheduler\SendUsageTask;
use pocketmine\snooze\SleeperHandler; use pocketmine\snooze\SleeperHandler;
use pocketmine\snooze\SleeperNotifier; use pocketmine\snooze\SleeperNotifier;

3
src/pocketmine/network/mcpe/protocol/DataPacket.php
View File

@ -25,6 +25,7 @@ namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\mcpe\CachedEncapsulatedPacket;
use pocketmine\network\mcpe\NetworkBinaryStream; use pocketmine\network\mcpe\NetworkBinaryStream;
use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\NetworkSession;
use pocketmine\utils\Utils; use pocketmine\utils\Utils;
@ -35,6 +36,8 @@ abstract class DataPacket extends NetworkBinaryStream{
/** @var bool */ /** @var bool */
public $isEncoded = false; public $isEncoded = false;
/** @var CachedEncapsulatedPacket */
public $__encapsulatedPacket = null;
/** @var int */ /** @var int */
public $senderSubId = 0; public $senderSubId = 0;