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

Replace remaining disallowed operators

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-01-20 19:23:19 +00:00
parent 61f8144280
commit 4e956d5d1d
9 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/resourcepacks/ZippedResourcePack.php
View File

@ -76,7 +76,7 @@ class ZippedResourcePack implements ResourcePack{
for($i = 0; $i < $archive->numFiles; ++$i){
$name = Utils::assumeNotFalse($archive->getNameIndex($i), "This index should be valid");
if(
($manifestPath === null or strlen($name) < strlen($manifestPath)) and
($manifestPath === null || strlen($name) < strlen($manifestPath)) &&
preg_match('#.*/manifest.json$#', $name) === 1
){
$manifestPath = $name;
@ -146,7 +146,7 @@ class ZippedResourcePack implements ResourcePack{
}
public function getSha256(bool $cached = true) : string{
if($this->sha256 === null or !$cached){
if($this->sha256 === null || !$cached){
$this->sha256 = hash_file("sha256", $this->path, true);
}
return $this->sha256;