From 5f55cdf26aa82a708236296e964ad923df88a069 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Tue, 9 Apr 2013 16:58:52 +0200 Subject: [PATCH] Added pvp server property --- src/API/ServerAPI.php | 1 + src/Player.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php index c89c0f60..84e4953a 100644 --- a/src/API/ServerAPI.php +++ b/src/API/ServerAPI.php @@ -99,6 +99,7 @@ class ServerAPI{ "server-type" => "normal", "time-per-second" => 20, "gamemode" => 1, + "pvp" => true, "difficulty" => 1, "generator" => "", "generator-settings" => "", diff --git a/src/Player.php b/src/Player.php index cf46a1c1..1af34d70 100644 --- a/src/Player.php +++ b/src/Player.php @@ -852,7 +852,9 @@ class Player{ $target = $this->server->api->entity->get($data["target"]); $data["targetentity"] = $target; $data["entity"] = $this->entity; - if(($target instanceof Entity) and $target->class === ENTITY_PLAYER and ($this->server->difficulty <= 0 or $target->gamemode === CREATIVE)){ + if(!($target instanceof Entity)){ + break; + }elseif($target->class === ENTITY_PLAYER and ($this->server->getProperty("pvp") == false or $this->server->difficulty <= 0 or $target->player->gamemode === CREATIVE)){ break; }elseif($this->handle("player.interact", $data) !== false){ switch($this->equipment->getID()){