Better Entity attacking system

This commit is contained in:
Shoghi Cervantes Pueyo 2013-03-05 17:37:09 +01:00
parent 52aa57d400
commit 7cf9c03735

View File

@ -681,13 +681,15 @@ class Player{
break; break;
} }
if(isset($this->server->entities[$data["target"]]) and Utils::distance($this->entity->position, $this->server->entities[$data["target"]]->position) <= 8){ if(isset($this->server->entities[$data["target"]]) and Utils::distance($this->entity->position, $this->server->entities[$data["target"]]->position) <= 8){
if($this->handle("player.interact", $data) !== false){ $target = $this->server->api->entity->get($data["target"]);
console("[DEBUG] EID ".$this->eid." attacked EID ".$data["target"], true, true, 2); $data["targetentity"] = $target;
if($this->server->difficulty > 0){ $data["entity"] = $this->entity;
if(($target instanceof Entity) and $target->class === ENTITY_PLAYER and ($this->server->difficulty <= 0 or $target->gamemode === CREATIVE)){
break;
}elseif($this->handle("player.interact", $data) !== false){
$this->server->api->entity->harm($data["target"], $this->server->difficulty, $this->eid); $this->server->api->entity->harm($data["target"], $this->server->difficulty, $this->eid);
} }
} }
}
break; break;
case MC_ANIMATE: case MC_ANIMATE:
if($this->loggedIn === false){ if($this->loggedIn === false){