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

New entity data flags

Browse Source 
@Intyre, you are beyond awesome
This commit is contained in:
Dylan K. Taylor 2016-10-25 10:43:37 +01:00
parent 6bcb3aeb26
commit bfc77a772a
6 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/entity/Ageable.php
View File

@ -23,9 +23,5 @@ namespace pocketmine\entity;
interface Ageable{
const DATA_AGEABLE_FLAGS = 14;
const DATA_FLAG_BABY = 0;
public function isBaby();
}

9
src/pocketmine/entity/Animal.php
View File

@ -24,14 +24,7 @@ namespace pocketmine\entity;
abstract class Animal extends Creature implements Ageable{
public function initEntity(){
parent::initEntity();
if($this->getDataProperty(self::DATA_AGEABLE_FLAGS) === null){
$this->setDataProperty(self::DATA_AGEABLE_FLAGS, self::DATA_TYPE_BYTE, 0);
}
}
public function isBaby(){
return $this->getDataFlag(self::DATA_AGEABLE_FLAGS, self::DATA_FLAG_BABY);
return $this->getDataFlag(self::DATA_FLAGS, self::DATA_FLAG_BABY);
}
}

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

@ -62,10 +62,8 @@ use pocketmine\Server;
abstract class Entity extends Location implements Metadatable{
const NETWORK_ID = -1;
const DATA_TYPE_BYTE = 0;
const DATA_TYPE_SHORT = 1;
const DATA_TYPE_INT = 2;
@ -110,10 +108,6 @@ abstract class Entity extends Location implements Metadatable{
* 57 (byte)
* 58 (float)
* 59 (float) */
/*
const DATA_SILENT = 4;
*/
const DATA_FLAG_ONFIRE = 0;
@ -122,13 +116,33 @@ abstract class Entity extends Location implements Metadatable{
const DATA_FLAG_SPRINTING = 3;
const DATA_FLAG_ACTION = 4;
const DATA_FLAG_INVISIBLE = 5;
const DATA_FLAG_TEMPTED = 6; //???
const DATA_FLAG_INLOVE = 7;
const DATA_FLAG_SADDLED = 8;
const DATA_FLAG_POWERED = 9;
const DATA_FLAG_IGNITED = 10; //for creepers?
const DATA_FLAG_BABY = 11;
const DATA_FLAG_CONVERTING = 12; //???
const DATA_FLAG_CRITICAL = 13;
const DATA_FLAG_CAN_SHOW_NAMETAG = 14;
const DATA_FLAG_ALWAYS_SHOW_NAMETAG = 15;
const DATA_FLAG_IMMOBILE = 16;
const DATA_FLAG_NOT_UNDERWATER = 30; //Hide bubbles if not underwater
const DATA_FLAG_IMMOBILE = 16, DATA_FLAG_NO_AI = 16;
const DATA_FLAG_SILENT = 17;
const DATA_FLAG_WALLCLIMBING = 18;
const DATA_FLAG_RESTING = 19; //for bats?
const DATA_FLAG_SITTING = 20;
const DATA_FLAG_ANGRY = 21;
const DATA_FLAG_INTERESTED = 22; //for mobs following players with food?
const DATA_FLAG_CHARGED = 23;
const DATA_FLAG_TAMED = 24;
const DATA_FLAG_LEASHED = 25;
const DATA_FLAG_SHEARED = 26; //for sheep
const DATA_FLAG_FALL_FLYING = 27; //???
const DATA_FLAG_ELDER = 28; //elder guardian
const DATA_FLAG_MOVING = 29;
const DATA_FLAG_BREATHING = 30; //hides bubbles if true
const DATA_FLAG_CHESTED = 31; //for mules?
const DATA_FLAG_STACKABLE = 32; //???
public static $entityCount = 1;
/** @var Entity[] */

2
src/pocketmine/entity/Living.php
View File

@ -178,7 +178,7 @@ abstract class Living extends Entity implements Damageable{
public function entityBaseTick($tickDiff = 1){
Timings::$timerLivingEntityBaseTick->startTiming();
$this->setDataFlag(self::DATA_FLAGS, self::DATA_FLAG_NOT_UNDERWATER, !$this->isInsideOfWater());
$this->setDataFlag(self::DATA_FLAGS, self::DATA_FLAG_BREATHING, !$this->isInsideOfWater());
$hasUpdate = parent::entityBaseTick($tickDiff);

2
src/pocketmine/entity/Villager.php
View File

@ -82,6 +82,6 @@ class Villager extends Creature implements NPC, Ageable{
}
public function isBaby(){
return $this->getDataFlag(self::DATA_AGEABLE_FLAGS, self::DATA_FLAG_BABY);
return $this->getDataFlag(self::DATA_FLAGS, self::DATA_FLAG_BABY);
}
}

8
src/pocketmine/entity/WaterAnimal.php
View File

@ -22,14 +22,8 @@
namespace pocketmine\entity;
abstract class WaterAnimal extends Creature implements Ageable{
public function initEntity(){
parent::initEntity();
if($this->getDataProperty(self::DATA_AGEABLE_FLAGS) === null){
$this->setDataProperty(self::DATA_AGEABLE_FLAGS, self::DATA_TYPE_BYTE, 0);
}
}
public function isBaby(){
return $this->getDataFlag(self::DATA_AGEABLE_FLAGS, self::DATA_FLAG_BABY);
return $this->getDataFlag(self::DATA_FLAGS, self::DATA_FLAG_BABY);
}
}