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

Inventory: Fix creative/spectator inventory sending

Browse Source
This commit is contained in:
Dylan K. Taylor
2016-09-06 13:05:53 +01:00
parent 5851e7fe55
commit f14a8e46be
3 changed files with 37 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/pocketmine/Player.php
View File

@ -1096,19 +1096,6 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->dataPacket($pk);
$this->sendSettings();
if($this->gamemode === Player::SPECTATOR){
$pk = new ContainerSetContentPacket();
$pk->windowid = ContainerSetContentPacket::SPECIAL_CREATIVE;
$this->dataPacket($pk);
}else{
$pk = new ContainerSetContentPacket();
$pk->windowid = ContainerSetContentPacket::SPECIAL_CREATIVE;
foreach(Item::getCreativeItems() as $item){
$pk->slots[] = clone $item;
}
$this->dataPacket($pk);
}
$this->inventory->sendContents($this);
$this->inventory->sendContents($this->getViewers());
$this->inventory->sendHeldItem($this->hasSpawned);
@ -1183,22 +1170,31 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->dataPacket($pk);
}
public function isSurvival(){
/**
* WARNING: This method does NOT return literal gamemode is survival, it will also return true for adventure mode players.
*/
public function isSurvival() : bool{
return ($this->gamemode & 0x01) === 0;
}
public function isCreative(){
return ($this->gamemode & 0x01) > 0;
/**
* WARNING: This method does NOT return literal gamemode is creative, it will also return true for creative mode players.
*/
public function isCreative() : bool{
return ($this->gamemode & 0x01) === 1;
}
public function isSpectator(){
return $this->gamemode === 3;
}
public function isAdventure(){
/**
* WARNING: This method does NOT return literal gamemode is adventure, it will also return true for spectator mode players.
*/
public function isAdventure() : bool{
return ($this->gamemode & 0x02) > 0;
}
public function isSpectator() : bool{
return $this->gamemode === 3;
}
public function getDrops(){
if(!$this->isCreative()){
return parent::getDrops();
@ -1632,7 +1628,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$nbt->playerGameType = new IntTag("playerGameType", $this->gamemode);
}
$this->allowFlight = $this->isCreative();
$this->allowFlight = (bool) $this->gamemode & 0x01;
if(($level = $this->server->getLevelByName($nbt["Level"])) === null){
$this->setLevel($this->server->getDefaultLevel());
@ -1737,17 +1733,6 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->setRemoveFormat(false);
}
if($this->gamemode === Player::SPECTATOR){
$pk = new ContainerSetContentPacket();
$pk->windowid = ContainerSetContentPacket::SPECIAL_CREATIVE;
$this->dataPacket($pk);
}else{
$pk = new ContainerSetContentPacket();
$pk->windowid = ContainerSetContentPacket::SPECIAL_CREATIVE;
$pk->slots = Item::getCreativeItems();
$this->dataPacket($pk);
}
$this->forceMovement = $this->teleportPosition = $this->getPosition();
$this->server->onPlayerLogin($this);