diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index b3daa096b..146177295 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -512,16 +512,16 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 
 	public function setSkin($str, $isSlim = false){
 		parent::setSkin($str, $isSlim);
-		$this->despawnFromAll();
 		if($this->spawned === true){
+			$this->despawnFromAll();
 			$this->spawnToAll();
 		}
 	}
 
 	public function setNameTag($name){
 		parent::setNameTag($name);
-		$this->despawnFromAll();
 		if($this->spawned === true){
+			$this->despawnFromAll();
 			$this->spawnToAll();
 		}
 	}
@@ -1423,7 +1423,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 
 							return;
 						}else{
-							break;
+							return;
 						}
 					}
 				}
diff --git a/src/pocketmine/lang/locale b/src/pocketmine/lang/locale
index fcf778a7e..ed9a06a6d 160000
--- a/src/pocketmine/lang/locale
+++ b/src/pocketmine/lang/locale
@@ -1 +1 @@
-Subproject commit fcf778a7e1aae1cabd12235ef901238ac7b803cc
+Subproject commit ed9a06a6d2bb491782ec2c8b4310aa683cfdf8af