From 7ef2708fca04b68696d0a0eb07cb237eef5899da Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Thu, 11 Sep 2014 16:43:11 +0200
Subject: [PATCH] Permission & interface optimization

---
 src/pocketmine/network/RakLibInterface.php         |  7 ++-----
 src/pocketmine/permission/PermissionAttachment.php | 14 +++++++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/pocketmine/network/RakLibInterface.php b/src/pocketmine/network/RakLibInterface.php
index b6ad89bba..89c989aa3 100644
--- a/src/pocketmine/network/RakLibInterface.php
+++ b/src/pocketmine/network/RakLibInterface.php
@@ -97,8 +97,6 @@ class RakLibInterface implements ServerInstance, SourceInterface{
 	/** @var ServerHandler */
 	private $interface;
 
-	private $tickTask;
-
 	private $upload = 0;
 	private $download = 0;
 
@@ -109,7 +107,6 @@ class RakLibInterface implements ServerInstance, SourceInterface{
 		$server = new RakLibServer($this->server->getLogger(), $this->server->getLoader(), $this->server->getPort(), $this->server->getIp() === "" ? "0.0.0.0" : $this->server->getIp());
 		$this->interface = new ServerHandler($server, $this);
 		$this->setName($this->server->getMotd());
-		$this->tickTask = $this->server->getScheduler()->scheduleRepeatingTask(new CallbackTask([$this, "doTick"]), 1);
 	}
 
 	public function doTick(){
@@ -124,6 +121,8 @@ class RakLibInterface implements ServerInstance, SourceInterface{
 			}
 		}
 
+		$this->doTick();
+
 		return $work;
 	}
 
@@ -147,12 +146,10 @@ class RakLibInterface implements ServerInstance, SourceInterface{
 	}
 
 	public function shutdown(){
-		$this->tickTask->cancel();
 		$this->interface->shutdown();
 	}
 
 	public function emergencyShutdown(){
-		$this->tickTask->cancel();
 		$this->interface->emergencyShutdown();
 	}
 
diff --git a/src/pocketmine/permission/PermissionAttachment.php b/src/pocketmine/permission/PermissionAttachment.php
index 585afbcda..75a8daba2 100644
--- a/src/pocketmine/permission/PermissionAttachment.php
+++ b/src/pocketmine/permission/PermissionAttachment.php
@@ -122,7 +122,12 @@ class PermissionAttachment{
 	 */
 	public function setPermission($name, $value){
 		$name = $name instanceof Permission ? $name->getName() : $name;
-		unset($this->permissions[$name]); //Fixes children getting overwritten
+		if(isset($this->permissions[$name])){
+			if($this->permissions[$name] === $value){
+				return;
+			}
+			unset($this->permissions[$name]); //Fixes children getting overwritten
+		}
 		$this->permissions[$name] = $value;
 		$this->permissible->recalculatePermissions();
 	}
@@ -131,8 +136,11 @@ class PermissionAttachment{
 	 * @param string|Permission $name
 	 */
 	public function unsetPermission($name){
-		unset($this->permissions[$name instanceof Permission ? $name->getName() : $name]);
-		$this->permissible->recalculatePermissions();
+		$name = $name instanceof Permission ? $name->getName() : $name;
+		if(isset($this->permissions[$name])){
+			unset($this->permissions[$name]);
+			$this->permissible->recalculatePermissions();
+		}
 	}
 
 	/**