mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity

AdventureSettings fixes and added isFlying properties and methods

Browse Source
This commit is contained in:
Dylan K. Taylor 2016-10-04 21:54:21 +01:00
parent 2bb50792c3
commit 08f11412a4
3 changed files with 83 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/pocketmine/Player.php
View File

@ -230,9 +230,10 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
protected $inAirTicks = 0;
protected $startAirTicks = 5;
//TODO: Abilities
protected $autoJump = true;
protected $allowFlight = false;
protected $isFlying = false;
private $needACK = [];
@ -309,10 +310,19 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->sendSettings();
}
public function getAllowFlight(){
public function getAllowFlight() : bool{
return $this->allowFlight;
}
public function setFlying(bool $value){
$this->isFlying = $value;
$this->sendSettings();
}
public function getIsFlying() : bool{
return $this->isFlying;
}
public function setAutoJump($value){
$this->autoJump = $value;
$this->sendSettings();
@ -1081,13 +1091,18 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->gamemode = $gm;
$this->allowFlight = $this->isCreative();
if($this->isSpectator()){
$this->isFlying = true;
$this->despawnFromAll();
}else{
if($this->isSurvival()){
$this->isFlying = false;
}
$this->spawnToAll();
}
$this->resetFallDistance();
$this->namedtag->playerGameType = new IntTag("playerGameType", $this->gamemode);
$pk = new SetPlayerGameTypePacket();
@ -1109,66 +1124,14 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
* Sends all the option flags
*/
public function sendSettings(){
/*
bit mask | flag name
0x00000001 world_inmutable
0x00000002 no_pvp
0x00000004 no_pvm
0x00000008 no_mvp
0x00000010 static_time
0x00000020 nametags_visible
0x00000040 auto_jump
0x00000080 allow_fly
0x00000100 noclip
0x00000200 ?
0x00000400 ?
0x00000800 ?
0x00001000 ?
0x00002000 ?
0x00004000 ?
0x00008000 ?
0x00010000 ?
0x00020000 ?
0x00040000 ?
0x00080000 ?
0x00100000 ?
0x00200000 ?
0x00400000 ?
0x00800000 ?
0x01000000 ?
0x02000000 ?
0x04000000 ?
0x08000000 ?
0x10000000 ?
0x20000000 ?
0x40000000 ?
0x80000000 ?
*/
$flags = 0;
if($this->isAdventure()){
$flags |= 0x01; //Do not allow placing/breaking blocks, adventure mode
}
/*if($nametags !== false){
$flags |= 0x20; //Show Nametags
}*/
if($this->autoJump){
$flags |= 0x40;
}
if($this->allowFlight){
$flags |= 0x80;
}
if($this->isSpectator()){
$flags |= 0x100;
}
$pk = new AdventureSettingsPacket();
$pk->flags = $flags;
$pk->flags = 0;
$pk->worldInmutable = $this->isAdventure();
$pk->autoJump = $this->autoJump;
$pk->allowFlight = $this->allowFlight;
$pk->noClip = $this->isSpectator();
$pk->isFlying = $this->isFlying;
$pk->userPermission = 2;
$pk->globalPermission = 2;
$this->dataPacket($pk);
}
@ -1879,6 +1842,16 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
}
$this->forceMovement = null;
break;
case ProtocolInfo::ADVENTURE_SETTINGS_PACKET:
//TODO: player abilities, check for other changes
if($packet->isFlying and !$this->allowFlight){
$this->kick("Flying is not enabled on this server");
break;
}else{
$this->isFlying = $packet->isFlying;
break;
}
break;
case ProtocolInfo::MOB_EQUIPMENT_PACKET:
if($this->spawned === false or !$this->isAlive()){

2
src/pocketmine/PocketMine.php
View File

@ -73,7 +73,7 @@ namespace pocketmine {
use pocketmine\wizard\Installer;
const VERSION = "1.6dev";
const API_VERSION = "2.0.0";
const API_VERSION = "2.0.1";
const CODENAME = "Unleashed";
const MINECRAFT_VERSION = "v0.15.90.7 alpha";
const MINECRAFT_VERSION_NETWORK = "0.15.90.7";

51
src/pocketmine/network/protocol/AdventureSettingsPacket.php
View File

@ -27,20 +27,65 @@ namespace pocketmine\network\protocol;
class AdventureSettingsPacket extends DataPacket{
const NETWORK_ID = Info::ADVENTURE_SETTINGS_PACKET;
public $flags;
public $worldInmutable;
public $allowPvp;
public $allowPvm;
public $allowMvp;
public $autoJump;
public $allowFlight;
public $noClip;
public $isFlying;
/*
bit mask | flag name
0x00000001 world_inmutable
0x00000002 no_pvp
0x00000004 no_pvm
0x00000008 no_mvp
0x00000010 ?
0x00000020 auto_jump
0x00000040 allow_fly
0x00000080 noclip
0x00000100 ?
0x00000200 is_flying
*/
public $flags = 0;
public $userPermission;
public $globalPermission;
public function decode(){
$this->flags = $this->getUnsignedVarInt();
$this->userPermission = $this->getUnsignedVarInt();
$this->worldInmutable = (bool) ($this->flags & 1);
$this->allowPvp = (bool) ($this->flags & (1 << 1));
$this->allowPvm = (bool) ($this->flags & (1 << 2));
$this->allowMvp = (bool) ($this->flags & (1 << 3));
$this->autoJump = (bool) ($this->flags & (1 << 5));
$this->allowFlight = (bool) ($this->flags & (1 << 6));
$this->noClip = (bool) ($this->flags & (1 << 7));
$this->isFlying = (bool) ($this->flags & (1 << 9));
}
public function encode(){
$this->reset();
$this->flags |= ((int) $this->worldInmutable);
$this->flags |= ((int) $this->allowPvp) << 1;
$this->flags |= ((int) $this->allowPvm) << 2;
$this->flags |= ((int) $this->allowMvp) << 3;
$this->flags |= ((int) $this->autoJump) << 5;
$this->flags |= ((int) $this->allowFlight) << 6;
$this->flags |= ((int) $this->noClip) << 7;
$this->flags |= ((int) $this->isFlying) << 9;
$this->putUnsignedVarInt($this->flags);
$this->putUnsignedVarInt($this->userPermission); //TODO: verify this
//$this->putInt($this->globalPermission);
}
}