Peaceful difficulty allows PvP

This commit is contained in:
Matt 2017-10-08 13:57:25 +02:00 committed by GitHub
parent 69e29236aa
commit 5b9515b20f

View File

@ -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;
}