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

Move a giant heap of network garbage out of Entity

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-04-26 18:52:38 +01:00
parent ea8c723092
commit 854a2f5135
19 changed files with 488 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,8 @@ use pocketmine\nbt\tag\FloatTag;
use pocketmine\nbt\tag\ListTag;
use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\network\mcpe\protocol\MobEffectPacket;
use pocketmine\network\mcpe\protocol\types\EntityMetadataFlags;
use pocketmine\network\mcpe\protocol\types\EntityMetadataProperties;
use pocketmine\Player;
use pocketmine\timings\Timings;
use pocketmine\utils\Binary;
@ -341,11 +343,11 @@ abstract class Living extends Entity implements Damageable{
}
if(!empty($colors)){
$this->propertyManager->setInt(Entity::DATA_POTION_COLOR, Color::mix(...$colors)->toARGB());
$this->propertyManager->setByte(Entity::DATA_POTION_AMBIENT, $ambient ? 1 : 0);
$this->propertyManager->setInt(EntityMetadataProperties::POTION_COLOR, Color::mix(...$colors)->toARGB());
$this->propertyManager->setByte(EntityMetadataProperties::POTION_AMBIENT, $ambient ? 1 : 0);
}else{
$this->propertyManager->setInt(Entity::DATA_POTION_COLOR, 0);
$this->propertyManager->setByte(Entity::DATA_POTION_AMBIENT, 0);
$this->propertyManager->setInt(EntityMetadataProperties::POTION_COLOR, 0);
$this->propertyManager->setByte(EntityMetadataProperties::POTION_AMBIENT, 0);
}
}
@ -769,7 +771,7 @@ abstract class Living extends Entity implements Damageable{
* @return bool
*/
public function isBreathing() : bool{
return $this->getGenericFlag(self::DATA_FLAG_BREATHING);
return $this->getGenericFlag(EntityMetadataFlags::BREATHING);
}
/**
@ -779,7 +781,7 @@ abstract class Living extends Entity implements Damageable{
* @param bool $value
*/
public function setBreathing(bool $value = true) : void{
$this->setGenericFlag(self::DATA_FLAG_BREATHING, $value);
$this->setGenericFlag(EntityMetadataFlags::BREATHING, $value);
}
/**
@ -789,7 +791,7 @@ abstract class Living extends Entity implements Damageable{
* @return int
*/
public function getAirSupplyTicks() : int{
return $this->propertyManager->getShort(self::DATA_AIR);
return $this->propertyManager->getShort(EntityMetadataProperties::AIR);
}
/**
@ -798,7 +800,7 @@ abstract class Living extends Entity implements Damageable{
* @param int $ticks
*/
public function setAirSupplyTicks(int $ticks) : void{
$this->propertyManager->setShort(self::DATA_AIR, $ticks);
$this->propertyManager->setShort(EntityMetadataProperties::AIR, $ticks);
}
/**
@ -806,7 +808,7 @@ abstract class Living extends Entity implements Damageable{
* @return int
*/
public function getMaxAirSupplyTicks() : int{
return $this->propertyManager->getShort(self::DATA_MAX_AIR);
return $this->propertyManager->getShort(EntityMetadataProperties::MAX_AIR);
}
/**
@ -815,7 +817,7 @@ abstract class Living extends Entity implements Damageable{
* @param int $ticks
*/
public function setMaxAirSupplyTicks(int $ticks) : void{
$this->propertyManager->setShort(self::DATA_MAX_AIR, $ticks);
$this->propertyManager->setShort(EntityMetadataProperties::MAX_AIR, $ticks);
}
/**