mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-18 09:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Peaceful difficulty allows PvP

Browse Source
This commit is contained in:
Matt 2017-10-08 13:57:25 +02:00 committed by GitHub
parent 69e29236aa
commit 5b9515b20f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Player.php
View File

@ -2485,7 +2485,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
}elseif($target instanceof Player){ }elseif($target instanceof Player){
if(($target->getGamemode() & 0x01) > 0){ if(($target->getGamemode() & 0x01) > 0){
return true; return true;
}elseif($this->server->getConfigBoolean("pvp") !== true or $this->level->getDifficulty() === Level::DIFFICULTY_PEACEFUL){ }elseif($this->server->getConfigBoolean("pvp") !== true){
$cancelled = true; $cancelled = true;
} }