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

Better /kill command, ensures death

Browse Source
This commit is contained in:
Shoghi Cervantes 2013-06-07 12:54:45 +02:00
parent c37c6da42d
commit 35c0c21c8d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/API/PlayerAPI.php
View File

@ -240,7 +240,8 @@ class PlayerAPI{
$player = $this->get($params[0]); $player = $this->get($params[0]);
} }
if($player instanceof Player){ if($player instanceof Player){
$this->server->api->entity->harm($player->eid, 20, "console", true); $player->entity->harm(1000, "console", true);
$player->sendChat("Ouch. That looks like it hurt.\n");
}else{ }else{
$output .= "Usage: /$cmd [player]\n"; $output .= "Usage: /$cmd [player]\n";
} }

2
src/world/Entity.php
View File

@ -782,7 +782,7 @@ class Entity extends Position{
} }
public function harm($dmg, $cause = "generic", $force = false){ public function harm($dmg, $cause = "generic", $force = false){
return $this->setHealth($this->getHealth() - ((int) $dmg), $cause, $force); return $this->setHealth(max(-128, $this->getHealth() - ((int) $dmg)), $cause, $force);
} }
public function heal($health, $cause = "generic"){ public function heal($health, $cause = "generic"){