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

Merge commit '8726604899d1a371567141e0831ed570d3233356'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-12-25 14:19:35 +00:00
parent 27fa73a4d2 8726604899
commit 0f718ea28b
16 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/permission/BanEntry.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\permission;
use function array_shift;
use function count;
use function explode;
use function implode;
use function strlen;
@@ -173,19 +174,19 @@ class BanEntry{
$parts = explode("|", trim($str));
$entry = new BanEntry(trim(array_shift($parts)));
if(!empty($parts)){
if(count($parts) > 0){
$entry->setCreated(self::parseDate(array_shift($parts)));
}
if(!empty($parts)){
if(count($parts) > 0){
$entry->setSource(trim(array_shift($parts)));
}
if(!empty($parts)){
if(count($parts) > 0){
$expire = trim(array_shift($parts));
if($expire !== "" and strtolower($expire) !== "forever"){
$entry->setExpires(self::parseDate($expire));
}
}
if(!empty($parts)){
if(count($parts) > 0){
$entry->setReason(trim(array_shift($parts)));
}

2
src/permission/PermissionManager.php
View File

@@ -168,7 +168,7 @@ class PermissionManager{
public function unsubscribeFromAllPermissions(Permissible $permissible) : void{
foreach($this->permSubs as $permission => &$subs){
unset($subs[spl_object_id($permissible)]);
if(empty($subs)){
if(count($subs) === 0){
unset($this->permSubs[$permission]);
}
}