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

Implemented no damage ticks

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-12-05 02:24:08 +01:00
parent 1a064d38b1
commit add7879720
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -566,6 +566,13 @@ abstract class Entity extends Location implements Metadatable{
} }
} }
if($this->noDamageTicks > 0){
$this->noDamageTicks -= $tickDiff;
if($this->noDamageTicks < 0){
$this->noDamageTicks = 0;
}
}
$this->age += $tickDiff; $this->age += $tickDiff;
$this->ticksLived += $tickDiff; $this->ticksLived += $tickDiff;

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

@ -69,7 +69,7 @@ abstract class Living extends Entity implements Damageable{
} }
public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){ public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
if($this->attackTime > 0){ if($this->attackTime > 0 or $this->noDamageTicks > 0){
$lastCause = $this->getLastDamageCause(); $lastCause = $this->getLastDamageCause();
if($lastCause instanceof EntityDamageEvent and $lastCause->getDamage() >= $damage){ if($lastCause instanceof EntityDamageEvent and $lastCause->getDamage() >= $damage){
if($source instanceof EntityDamageEvent){ if($source instanceof EntityDamageEvent){
@ -82,6 +82,8 @@ abstract class Living extends Entity implements Damageable{
}else{ }else{
return; return;
} }
}else{
return;
} }
}elseif($source instanceof EntityDamageEvent){ }elseif($source instanceof EntityDamageEvent){
$this->server->getPluginManager()->callEvent($source); $this->server->getPluginManager()->callEvent($source);