Fixed resource pack and..

Author: gg-script

src/pocketmine/Player.php

@@ -1058,6 +1058,13 @@ protected function doFirstSpawn(){
 		$this->spawned = true;
 		$this->setImmobile(false);
 
+		if($this->hasPermission(Server::BROADCAST_CHANNEL_USERS)){
+			$this->server->getPluginManager()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $this);
+		}
+		if($this->hasPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE)){
+			$this->server->getPluginManager()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
+		}
+
 		$this->sendPotionEffects($this);
 
 		$this->sendData($this);
@@ -2193,20 +2200,19 @@ protected function processLogin(){
 			return;
 		}
 
-		if($this->hasPermission(Server::BROADCAST_CHANNEL_USERS)){
-			$this->server->getPluginManager()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $this);
-		}
-		if($this->hasPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE)){
-			$this->server->getPluginManager()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this);
-		}
-
 		foreach($this->server->getOnlinePlayers() as $p){
 			if($p !== $this and ($p->iusername === $this->iusername or $this->getUniqueId()->equals($p->getUniqueId()))){
 				$this->close($this->getLeaveMessage(), "Игрок с данным ником уже играет, смените ник!");
 				return;
 			}
 		}
 
+		if ($this->loggedIn) {
+			$this->server->getNetwork()->blockAddress($this->getAddress(), 1203);
+			
+			return;
+		}
+
 		$this->setNameTag($this->getDisplayName());
 
 		$nbt = $this->server->getOfflinePlayerData($this->username);

src/pocketmine/level/format/Chunk.php

@@ -28,6 +28,7 @@
 
 use pocketmine\block\Block;
 use pocketmine\entity\Entity;
+use pocketmine\entity\XPOrb;
 use pocketmine\level\format\io\ChunkException;
 use pocketmine\level\Level;
 use pocketmine\nbt\NBT;
@@ -624,7 +625,7 @@ public function setGenerated(bool $value = true){
      * @param Entity $entity
      */
     public function addEntity(Entity $entity){
-    	if($entity->isClosed()){
+    	if($entity->isClosed() and !($entity instanceof XPOrb)){ //TODO: очень тупой костыль
             throw new \InvalidArgumentException("Attempted to add a garbage closed Entity to a chunk");
         }
         $this->entities[$entity->getId()] = $entity;