From a982344b96cf51ebab0af05d3c4216a5b0fc2012 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sun, 27 Aug 2017 19:09:05 +0100
Subject: [PATCH] Cleaned up Level->addSound() and Level->addParticle()

---
 src/pocketmine/level/Level.php | 42 ++++++++++------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index bded220e6..77a52f38f 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -409,49 +409,31 @@ class Level implements ChunkManager, Metadatable{
 
 	public function addSound(Sound $sound, array $players = null){
 		$pk = $sound->encode();
+		if(!is_array($pk)){
+			$pk = [$pk];
+		}
 
 		if($players === null){
-			if($pk !== null){
-				if(!is_array($pk)){
-					$this->addChunkPacket($sound->x >> 4, $sound->z >> 4, $pk);
-				}else{
-					foreach($pk as $e){
-						$this->addChunkPacket($sound->x >> 4, $sound->z >> 4, $e);
-					}
-				}
+			foreach($pk as $e){
+				$this->addChunkPacket($sound->x >> 4, $sound->z >> 4, $e);
 			}
 		}else{
-			if($pk !== null){
-				if(!is_array($pk)){
-					$this->server->broadcastPacket($players, $pk);
-				}else{
-					$this->server->batchPackets($players, $pk, false);
-				}
-			}
+			$this->server->batchPackets($players, $pk, false);
 		}
 	}
 
 	public function addParticle(Particle $particle, array $players = null){
 		$pk = $particle->encode();
+		if(!is_array($pk)){
+			$pk = [$pk];
+		}
 
 		if($players === null){
-			if($pk !== null){
-				if(!is_array($pk)){
-					$this->addChunkPacket($particle->x >> 4, $particle->z >> 4, $pk);
-				}else{
-					foreach($pk as $e){
-						$this->addChunkPacket($particle->x >> 4, $particle->z >> 4, $e);
-					}
-				}
+			foreach($pk as $e){
+				$this->addChunkPacket($particle->x >> 4, $particle->z >> 4, $e);
 			}
 		}else{
-			if($pk !== null){
-				if(!is_array($pk)){
-					$this->server->broadcastPacket($players, $pk);
-				}else{
-					$this->server->batchPackets($players, $pk, false);
-				}
-			}
+			$this->server->batchPackets($players, $pk, false);
 		}
 	}