mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-05 17:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into api3/network

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-03-12 12:22:11 +00:00
parent 91a92b4e57 4f27bce5b3
commit 6c5dbd7359
10 changed files with 187 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,7 +423,7 @@ abstract class Entity extends Location implements Metadatable{
if($value !== $this->isSprinting()){
$this->setDataFlag(self::DATA_FLAGS, self::DATA_FLAG_SPRINTING, (bool) $value);
$attr = $this->attributeMap->getAttribute(Attribute::MOVEMENT_SPEED);
$attr->setValue($value ? ($attr->getValue() * 1.3) : ($attr->getValue() / 1.3));
$attr->setValue($value ? ($attr->getValue() * 1.3) : ($attr->getValue() / 1.3), false, true);
}
}
@ -1643,10 +1643,15 @@ abstract class Entity extends Location implements Metadatable{
$this->despawnFromAll();
if($this->chunk !== null){
$this->chunk->removeEntity($this);
$this->chunk = null;
}
if($this->getLevel() !== null){
$this->getLevel()->removeEntity($this);
$this->setLevel(null);
}
$this->namedtag = null;
}
}