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

Removed a couple of useless null checks from PermissibleBase

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-04-27 18:00:20 +01:00
parent 7f09a2a26e
commit edf1fbb6e6
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/permission/PermissibleBase.php
View File

@ -127,9 +127,7 @@ class PermissibleBase implements Permissible{
* @throws PluginException * @throws PluginException
*/ */
public function addAttachment(Plugin $plugin, $name = null, $value = null){ public function addAttachment(Plugin $plugin, $name = null, $value = null){
if($plugin === null){ if(!$plugin->isEnabled()){
throw new PluginException("Plugin cannot be null");
}elseif(!$plugin->isEnabled()){
throw new PluginException("Plugin " . $plugin->getDescription()->getName() . " is disabled"); throw new PluginException("Plugin " . $plugin->getDescription()->getName() . " is disabled");
} }
@ -146,14 +144,8 @@ class PermissibleBase implements Permissible{
/** /**
* @param PermissionAttachment $attachment * @param PermissionAttachment $attachment
*
* @throws \Exception
*/ */
public function removeAttachment(PermissionAttachment $attachment){ public function removeAttachment(PermissionAttachment $attachment){
if($attachment === null){
throw new \InvalidStateException("Attachment cannot be null");
}
if(isset($this->attachments[spl_object_hash($attachment)])){ if(isset($this->attachments[spl_object_hash($attachment)])){
unset($this->attachments[spl_object_hash($attachment)]); unset($this->attachments[spl_object_hash($attachment)]);
if(($ex = $attachment->getRemovalCallback()) !== null){ if(($ex = $attachment->getRemovalCallback()) !== null){