From 9c9d7861947a5182a7a6c1efefea3d92b3b4319d Mon Sep 17 00:00:00 2001
From: williamtdr <william@cboos.com>
Date: Wed, 16 Jul 2014 13:07:26 -0500
Subject: [PATCH] Fix #1659

---
 src/pocketmine/Player.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 58f2dd024..89f0d5844 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1612,6 +1612,14 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 				$this->craftingType = 0;
 
 				$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){
 					$cancelled = false;