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

Fix #1659

Browse Source
This commit is contained in:
williamtdr 2014-07-16 13:07:26 -05:00
parent bd2cb4b851
commit 9c9d786194
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/Player.php
View File

@ -1613,6 +1613,14 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
$target = $this->getLevel()->getEntity($packet->target); $target = $this->getLevel()->getEntity($packet->target);
if(
$target instanceof Player and
$this->server->getConfigBoolean("pvp",true) === false
){
$cancelled = true;
}
if($target instanceof Entity and $this->getGamemode() !== Player::VIEW and $this->blocked === false and $this->dead !== true and $target->dead !== true){ if($target instanceof Entity and $this->getGamemode() !== Player::VIEW and $this->blocked === false and $this->dead !== true and $target->dead !== true){
$cancelled = false; $cancelled = false;
$item = $this->inventory->getItemInHand(); $item = $this->inventory->getItemInHand();