mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 08:44:01 +00:00
Code Issues Projects Releases Wiki Activity

Added pvp server property

Browse Source
This commit is contained in:
Shoghi Cervantes Pueyo 2013-04-09 16:58:52 +02:00
parent 3e3521086b
commit 5f55cdf26a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/API/ServerAPI.php
View File

@ -99,6 +99,7 @@ class ServerAPI{
"server-type" => "normal",
"time-per-second" => 20,
"gamemode" => 1,
"pvp" => true,
"difficulty" => 1,
"generator" => "",
"generator-settings" => "",

4
src/Player.php
View File

@ -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()){