mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 11:26:37 +00:00
Code Issues Projects Releases Wiki Activity

Added more damage sources

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-07-10 14:02:56 +02:00
parent 99c5ad789b
commit c9535162bd
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/Player.php
View File

@ -2150,17 +2150,28 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
case EntityDamageEvent::CAUSE_SUICIDE:
break;
case EntityDamageEvent::CAUSE_VOID:
$message = $this->getName() ." fell out of the world";
break;
case EntityDamageEvent::CAUSE_FALL:
if($ev instanceof EntityDamageEvent){
if($ev->getFinalDamage() > 2){
$message = $this->getName() ." fell from a high place";
break;
}
}
$message = $this->getName() ." hit the ground too hard";
break;
case EntityDamageEvent::CAUSE_CONTACT:
case EntityDamageEvent::CAUSE_PROJECTILE:
case EntityDamageEvent::CAUSE_SUFFOCATION:
case EntityDamageEvent::CAUSE_FALL:
case EntityDamageEvent::CAUSE_FIRE:
case EntityDamageEvent::CAUSE_FIRE_TICK:
case EntityDamageEvent::CAUSE_LAVA:
case EntityDamageEvent::CAUSE_DROWNING:
case EntityDamageEvent::CAUSE_BLOCK_EXPLOSION:
case EntityDamageEvent::CAUSE_ENTITY_EXPLOSION:
case EntityDamageEvent::CAUSE_VOID:
case EntityDamageEvent::CAUSE_MAGIC:
case EntityDamageEvent::CAUSE_CUSTOM:

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

@ -581,8 +581,15 @@ abstract class Entity extends Position implements Metadatable{
return $this->boundingBox;
}
public function fall($fallDistance){ //TODO
public function fall($fallDistance){
$damage = floor($fallDistance - 3);
if($damage > 0){
$this->server->getPluginManager()->callEvent($ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FALL, $damage));
if($ev->isCancelled()){
return;
}
$this->attack($ev->getFinalDamage(), $ev);
}
}
public function handleWaterMovement(){ //TODO