From 5b9515b20f86a79d460f405e1ae107184955c573 Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 8 Oct 2017 13:57:25 +0200 Subject: [PATCH] Peaceful difficulty allows PvP --- src/pocketmine/Player.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 6501ec2ca..dc87d7863 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -2485,7 +2485,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ }elseif($target instanceof Player){ if(($target->getGamemode() & 0x01) > 0){ return true; - }elseif($this->server->getConfigBoolean("pvp") !== true or $this->level->getDifficulty() === Level::DIFFICULTY_PEACEFUL){ + }elseif($this->server->getConfigBoolean("pvp") !== true){ $cancelled = true; }