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

Improved Entity attack()/heal() event firing

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-03-25 09:57:11 +01:00
parent d1760d9bb8
commit d19631226f
8 changed files with 57 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -513,18 +513,42 @@ abstract class Entity extends Location implements Metadatable{
}
/**
* @param float $damage
* @param int|EntityDamageEvent $source
* @param float $damage
* @param EntityDamageEvent $source
*
*/
abstract function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC);
public function attack($damage, EntityDamageEvent $source){
if($this->hasEffect(Effect::FIRE_RESISTANCE)
and $source->getCause() === EntityDamageEvent::CAUSE_FIRE
and $source->getCause() === EntityDamageEvent::CAUSE_FIRE_TICK
and $source->getCause() === EntityDamageEvent::CAUSE_LAVA){
$source->setCancelled();
}
$this->server->getPluginManager()->callEvent($source);
if($source->isCancelled()){
return;
}
$this->setLastDamageCause($source);
$this->setHealth($this->getHealth() - $source->getFinalDamage());
}
/**
* @param float $amount
* @param int|EntityRegainHealthEvent $source
* @param float $amount
* @param EntityRegainHealthEvent $source
*
*/
abstract function heal($amount, $source = EntityRegainHealthEvent::CAUSE_MAGIC);
public function heal($amount, EntityRegainHealthEvent $source){
$this->server->getPluginManager()->callEvent($source);
if($source->isCancelled()){
return;
}
$this->setHealth($this->getHealth() + $source->getAmount());
}
/**
* @return int
@@ -556,10 +580,10 @@ abstract class Entity extends Location implements Metadatable{
}
/**
* @param int|EntityDamageEvent $type
* @param EntityDamageEvent $type
*/
public function setLastDamageCause($type){
$this->lastDamageCause = $type instanceof EntityDamageEvent ? $type : $type;
public function setLastDamageCause(EntityDamageEvent $type){
$this->lastDamageCause = $type;
}
/**