Merge branch '3.6'

This commit is contained in:
Dylan K. Taylor 2019-02-24 12:14:40 +00:00
commit a3907377f5

View File

@ -3340,8 +3340,8 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
throw new \InvalidArgumentException("Cannot remove fixed window $id (" . get_class($inventory) . ") from " . $this->getName());
}
$inventory->close($this);
if($id !== null){
$inventory->close($this);
unset($this->windows[$hash], $this->windowIndex[$id], $this->permanentWindows[$id]);
}
}