diff --git a/src/event/HandlerList.php b/src/event/HandlerList.php index b135a53cd..71b159ca5 100644 --- a/src/event/HandlerList.php +++ b/src/event/HandlerList.php @@ -65,11 +65,11 @@ class HandlerList{ * @param RegisteredListener|Listener|Plugin $object */ public function unregister($object) : void{ - if($object instanceof Plugin or $object instanceof Listener){ + if($object instanceof Plugin || $object instanceof Listener){ foreach($this->handlerSlots as $priority => $list){ foreach($list as $hash => $listener){ - if(($object instanceof Plugin and $listener->getPlugin() === $object) - or ($object instanceof Listener and (new \ReflectionFunction($listener->getHandler()))->getClosureThis() === $object) //this doesn't even need to be a listener :D + if(($object instanceof Plugin && $listener->getPlugin() === $object) + || ($object instanceof Listener && (new \ReflectionFunction($listener->getHandler()))->getClosureThis() === $object) //this doesn't even need to be a listener :D ){ unset($this->handlerSlots[$priority][$hash]); } diff --git a/src/event/HandlerListManager.php b/src/event/HandlerListManager.php index 0859b1e5e..864b639d7 100644 --- a/src/event/HandlerListManager.php +++ b/src/event/HandlerListManager.php @@ -45,7 +45,7 @@ class HandlerListManager{ * @param Plugin|Listener|RegisteredListener|null $object */ public function unregisterAll($object = null) : void{ - if($object instanceof Listener or $object instanceof Plugin or $object instanceof RegisteredListener){ + if($object instanceof Listener || $object instanceof Plugin || $object instanceof RegisteredListener){ foreach($this->allLists as $h){ $h->unregister($object); } diff --git a/src/event/RegisteredListener.php b/src/event/RegisteredListener.php index cc22a0511..d0732bc99 100644 --- a/src/event/RegisteredListener.php +++ b/src/event/RegisteredListener.php @@ -68,7 +68,7 @@ class RegisteredListener{ } public function callEvent(Event $event) : void{ - if($event instanceof Cancellable and $event->isCancelled() and !$this->isHandlingCancelled()){ + if($event instanceof Cancellable && $event->isCancelled() && !$this->isHandlingCancelled()){ return; } $this->timings->startTiming();