Merge remote-tracking branch 'pmmp/master'

src/pocketmine/Player.php

@@ -230,7 +230,7 @@ public static function isValidUserName(?string $name) : bool{
 	/** @var int */
 	protected $spawnThreshold;
 	/** @var int */
-	protected $chunkLoadCount = 0;
+	protected $spawnChunkLoadCount = 0;
 	/** @var int */
 	protected $chunksPerTick;
 
@@ -904,7 +904,6 @@ public function sendChunk(int $x, int $z, CompressBatchPromise $promise){
 		}
 
 		$this->usedChunks[Level::chunkHash($x, $z)] = true;
-		$this->chunkLoadCount++;
 
 		$this->networkSession->queueCompressed($promise);
 
@@ -914,7 +913,8 @@ public function sendChunk(int $x, int $z, CompressBatchPromise $promise){
 					$entity->spawnTo($this);
 				}
 			}
-		}elseif($this->chunkLoadCount >= $this->spawnThreshold){
+		}elseif(++$this->spawnChunkLoadCount >= $this->spawnThreshold){
+			$this->spawnChunkLoadCount = -1;
 			$this->spawned = true;
 
 			foreach($this->usedChunks as $index => $c){

src/pocketmine/entity/Entity.php

@@ -629,6 +629,9 @@ public function getScale() : float{
 	 * @param float $value
 	 */
 	public function setScale(float $value) : void{
+		if($value <= 0){
+			throw new \InvalidArgumentException("Scale must be greater than 0");
+		}
 		$multiplier = $value / $this->getScale();
 
 		$this->width *= $multiplier;

src/pocketmine/level/Level.php

@@ -455,13 +455,14 @@ public function addSound(Sound $sound, array $players = null){
 		if(!is_array($pk)){
 			$pk = [$pk];
 		}
-
-		if($players === null){
-			foreach($pk as $e){
-				$this->broadcastPacketToViewers($sound, $e);
+		if(!empty($pk)){
+			if($players === null){
+				foreach($pk as $e){
+					$this->broadcastPacketToViewers($sound, $e);
+				}
+			}else{
+				$this->server->broadcastPackets($players, $pk);
 			}
-		}else{
-			$this->server->broadcastPackets($players, $pk);
 		}
 	}
 
@@ -470,13 +471,14 @@ public function addParticle(Particle $particle, array $players = null){
 		if(!is_array($pk)){
 			$pk = [$pk];
 		}
-
-		if($players === null){
-			foreach($pk as $e){
-				$this->broadcastPacketToViewers($particle, $e);
+		if(!empty($pk)){
+			if($players === null){
+				foreach($pk as $e){
+					$this->broadcastPacketToViewers($particle, $e);
+				}
+			}else{
+				$this->server->broadcastPackets($players, $pk);
 			}
-		}else{
-			$this->server->broadcastPackets($players, $pk);
 		}
 	}