mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-11 22:15:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michael Yoo 2014-07-09 18:43:33 +09:30
commit 99d4ff5bdb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -436,7 +436,7 @@ abstract class Entity extends Position implements Metadatable{
} }
}else{ }else{
if(($this->fireTicks % 20) === 0){ if(($this->fireTicks % 20) === 0){
$this->attack(1, "onFire"); $this->attack(1, EntityDamageEvent::CAUSE_FIRE_TICK);
} }
--$this->fireTicks; --$this->fireTicks;
} }
@ -444,7 +444,7 @@ abstract class Entity extends Position implements Metadatable{
} }
if($this->handleLavaMovement()){ if($this->handleLavaMovement()){
$this->attack(4, "lava"); $this->attack(4, EntityDamageEvent::CAUSE_LAVA);
$this->setOnFire(15); $this->setOnFire(15);
$hasUpdate = true; $hasUpdate = true;
$this->fallDistance *= 0.5; $this->fallDistance *= 0.5;
@ -1050,4 +1050,4 @@ abstract class Entity extends Position implements Metadatable{
$this->server->getEntityMetadata()->removeMetadata($this, $metadataKey, $plugin); $this->server->getEntityMetadata()->removeMetadata($this, $metadataKey, $plugin);
} }
} }