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

Improved damage sources for projectiles, falling blocks, TNT, and items

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-05-31 14:19:47 +02:00
parent 9e14435dbb
commit 14ff537e71
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,9 @@ class FallingSand extends Entity{
} }
public function attack($damage, EntityDamageEvent $source){ public function attack($damage, EntityDamageEvent $source){
if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
parent::attack($damage, $source);
}
} }
public function onUpdate($currentTick){ public function onUpdate($currentTick){

11
src/pocketmine/entity/Item.php
View File

@ -75,6 +75,17 @@ class Item extends Entity{
$this->server->getPluginManager()->callEvent(new ItemSpawnEvent($this)); $this->server->getPluginManager()->callEvent(new ItemSpawnEvent($this));
} }
public function attack($damage, EntityDamageEvent $source){
if(
$source->getCause() === EntityDamageEvent::CAUSE_VOID or
$source->getCause() === EntityDamageEvent::CAUSE_FIRE_TICK or
$source->getCause() === EntityDamageEvent::CAUSE_ENTITY_EXPLOSION or
$source->getCause() === EntityDamageEvent::CAUSE_BLOCK_EXPLOSION
){
parent::attack($damage, $source);
}
}
public function onUpdate($currentTick){ public function onUpdate($currentTick){
if($this->closed){ if($this->closed){
return false; return false;

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

@ -47,7 +47,9 @@ class PrimedTNT extends Entity implements Explosive{
public function attack($damage, EntityDamageEvent $source){ public function attack($damage, EntityDamageEvent $source){
if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
parent::attack($damage, $source);
}
} }
protected function initEntity(){ protected function initEntity(){

5
src/pocketmine/entity/Projectile.php
View File

@ -52,9 +52,10 @@ abstract class Projectile extends Entity{
parent::__construct($chunk, $nbt); parent::__construct($chunk, $nbt);
} }
public function attack($damage, EntityDamageEvent $source){ public function attack($damage, EntityDamageEvent $source){
if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
parent::attack($damage, $source);
}
} }
protected function initEntity(){ protected function initEntity(){