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

Found some missing data flags and proper fix for ladders

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-04-20 19:42:00 +01:00
parent a0ba8f0098
commit 3f1790bcb8
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pocketmine/Player.php
View File

@ -1866,6 +1866,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->sendAttributes(true);
$this->setNameTagVisible(true);
$this->setNameTagAlwaysVisible(true);
$this->setCanClimb(true);
$this->server->getLogger()->info($this->getServer()->getLanguage()->translateString("pocketmine.player.logIn", [
TextFormat::AQUA . $this->username . TextFormat::WHITE,

50
src/pocketmine/entity/Entity.php
View File

@ -166,7 +166,9 @@ abstract class Entity extends Location implements Metadatable{
const DATA_FLAG_IMMOBILE = 16, DATA_FLAG_NO_AI = 16;
const DATA_FLAG_SILENT = 17;
const DATA_FLAG_WALLCLIMBING = 18;
const DATA_FLAG_CAN_CLIMB = 19;
const DATA_FLAG_SWIMMER = 20;
const DATA_FLAG_CAN_FLY = 21;
const DATA_FLAG_RESTING = 22;
const DATA_FLAG_SITTING = 23;
const DATA_FLAG_ANGRY = 24;
@ -485,44 +487,39 @@ abstract class Entity extends Location implements Metadatable{
}
/**
* Sets whether this entity is currently able to climb blocks. By default this is only true if the entity is climbing a ladder or vine or similar block.
* Returns whether the entity is able to climb blocks such as ladders or vines.
* @return bool
*/
public function canClimb() : bool{
return $this->getDataFlag(self::DATA_FLAGS, self::DATA_FLAG_CAN_CLIMB);
}
/**
* Sets whether the entity is able to climb climbable blocks.
* @param bool $value
*/
public function setCanClimb(bool $value){
$this->setDataFlag(self::DATA_FLAGS, self::DATA_FLAG_CAN_CLIMB, $value);
}
/**
* Returns whether this entity is climbing a block. By default this is only true if the entity is climbing a ladder or vine or similar block.
*
* @return bool
*/
public function isClimbing() : bool{
public function canClimbWalls() : bool{
return $this->getDataFlag(self::DATA_FLAGS, self::DATA_FLAG_WALLCLIMBING);
}
/**
* Sets whether the entity can climb blocks. If true, the entity can climb anything, if false, they cannot climb anything (this includes ladders and vines).
* Sets whether the entity is climbing a block. If true, the entity can climb anything.
*
* @param bool $value
*/
public function setClimbing(bool $value = true){
public function setCanClimbWalls(bool $value = true){
$this->setDataFlag(self::DATA_FLAGS, self::DATA_FLAG_WALLCLIMBING, $value);
}
/**
* Checks blocks adjacent to the entity's feet to check if it is currently colliding with a climbable block.
*/
protected function checkClimbing(){
$climbing = false;
$block = $this->level->getBlock($this);
if($block->canClimb()){
$climbing = true;
}else{
for($i = 0; $i <= 5; ++$i){
if($block->getSide($i)->canClimb()){
$climbing = true;
break;
}
}
}
$this->setClimbing($climbing);
}
/**
* @return Effect[]
*/
@ -1503,7 +1500,6 @@ abstract class Entity extends Location implements Metadatable{
$this->checkChunks();
$this->checkGroundState($movX, $movY, $movZ, $dx, $dy, $dz);
$this->checkClimbing();
$this->updateFallState($dy, $this->onGround);
if($movX != $dx){