mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-17 19:50:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '3ec2994d7f05f30e2519430379ae0f3106be5074'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
This commit is contained in:
Dylan K. Taylor
2020-05-20 19:52:03 +01:00
parent 3bb53658da 3ec2994d7f
commit 570a709059
4 changed files with 65 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/network/mcpe/NetworkSession.php
View File

@@ -682,7 +682,7 @@ class NetworkSession{
}
public function syncGameMode(GameMode $mode, bool $isRollback = false) : void{
$this->sendDataPacket(SetPlayerGameTypePacket::create(self::getClientFriendlyGamemode($mode)));
$this->sendDataPacket(SetPlayerGameTypePacket::create(TypeConverter::getInstance()->getClientFriendlyGamemode($mode)));
$this->syncAdventureSettings($this->player);
if(!$isRollback){
$this->invManager->syncCreative();
@@ -943,18 +943,4 @@ class NetworkSession{
return false;
}
/**
* Returns a client-friendly gamemode of the specified real gamemode
* This function takes care of handling gamemodes known to MCPE (as of 1.1.0.3, that includes Survival, Creative and Adventure)
*
* @internal
*/
public static function getClientFriendlyGamemode(GameMode $gamemode) : int{
if($gamemode->equals(GameMode::SPECTATOR())){
return GameMode::CREATIVE()->getMagicNumber();
}
return $gamemode->getMagicNumber();
}
}