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

Fixed squid health attribute errors

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-04-21 14:42:19 +01:00
parent a356e36340
commit e7406ba096
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,6 +339,7 @@ abstract class Entity extends Location implements Metadatable{
$this->invulnerable = $this->namedtag["Invulnerable"] > 0 ? true : false; $this->invulnerable = $this->namedtag["Invulnerable"] > 0 ? true : false;
$this->attributeMap = new AttributeMap(); $this->attributeMap = new AttributeMap();
$this->addAttributes();
$this->chunk->addEntity($this); $this->chunk->addEntity($this);
$this->level->addEntity($this); $this->level->addEntity($this);
@ -642,8 +643,6 @@ abstract class Entity extends Location implements Metadatable{
$this->scheduleUpdate(); $this->scheduleUpdate();
$this->addAttributes();
if(isset($this->namedtag->ActiveEffects)){ if(isset($this->namedtag->ActiveEffects)){
foreach($this->namedtag->ActiveEffects->getValue() as $e){ foreach($this->namedtag->ActiveEffects->getValue() as $e){
$amplifier = $e["Amplifier"] & 0xff; //0-255 only $amplifier = $e["Amplifier"] & 0xff; //0-255 only

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

@ -68,7 +68,7 @@ abstract class Living extends Entity implements Damageable{
public function setHealth($amount){ public function setHealth($amount){
$wasAlive = $this->isAlive(); $wasAlive = $this->isAlive();
parent::setHealth($amount); parent::setHealth($amount);
$this->attributeMap->getAttribute(Attribute::HEALTH)->setValue($this->getHealth()); $this->attributeMap->getAttribute(Attribute::HEALTH)->setValue($this->getHealth(), true);
if($this->isAlive() and !$wasAlive){ if($this->isAlive() and !$wasAlive){
$pk = new EntityEventPacket(); $pk = new EntityEventPacket();
$pk->eid = $this->getId(); $pk->eid = $this->getId();

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

@ -43,8 +43,8 @@ class Squid extends WaterAnimal implements Ageable{
private $switchDirectionTicker = 0; private $switchDirectionTicker = 0;
public function initEntity(){ public function initEntity(){
$this->setMaxHealth(10);
parent::initEntity(); parent::initEntity();
$this->setMaxHealth(5);
} }
public function getName(){ public function getName(){