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

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-03-09 14:33:37 +00:00
commit df65f1009c
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/network/mcpe/protocol/MultiplayerSettingsPacket.php
View File

@ -27,7 +27,7 @@ namespace pocketmine\network\mcpe\protocol;
use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\NetworkSession;
class MultiplayerSettingsPacket extends DataPacket/* implements ServerboundPacket*/{ //TODO: this might be clientbound too, but unsure class MultiplayerSettingsPacket extends DataPacket/* implements ClientboundPacket, ServerboundPacket*/{
public const NETWORK_ID = ProtocolInfo::MULTIPLAYER_SETTINGS_PACKET; public const NETWORK_ID = ProtocolInfo::MULTIPLAYER_SETTINGS_PACKET;
public const ACTION_ENABLE_MULTIPLAYER = 0; public const ACTION_ENABLE_MULTIPLAYER = 0;

2
src/pocketmine/plugin/PluginDescription.php
View File

@ -89,7 +89,6 @@ class PluginDescription{
/** /**
* @param string|mixed[] $yamlString * @param string|mixed[] $yamlString
* @phpstan-param string|array<string, mixed> $yamlString
*/ */
public function __construct($yamlString){ public function __construct($yamlString){
$this->loadMap(!is_array($yamlString) ? yaml_parse($yamlString) : $yamlString); $this->loadMap(!is_array($yamlString) ? yaml_parse($yamlString) : $yamlString);
@ -97,7 +96,6 @@ class PluginDescription{
/** /**
* @param mixed[] $plugin * @param mixed[] $plugin
* @phpstan-param array<string, mixed> $plugin
* @throws PluginException * @throws PluginException
*/ */
private function loadMap(array $plugin) : void{ private function loadMap(array $plugin) : void{