mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 11:39:43 +00:00
Merge 929b5bab36 into dbaa8a659f
This commit is contained in:
commit
0a620ede1b
33 changed files with 1153 additions and 723 deletions
|
|
@ -1078,7 +1078,7 @@ class Entity extends Position
|
|||
|
||||
public function interactWith(Entity $e, $action)
|
||||
{
|
||||
if($this->isPlayer() and ($this->server->api->getProperty("pvp") == false or $this->server->difficulty <= 0 or ($this->player->gamemode & 0x01) === 0x01)){
|
||||
if($this->isPlayer() and ($this->level->getProperty("pvp") == false or $this->server->difficulty <= 0 or ($this->player->gamemode & 0x01) === 0x01)){
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue