From 61d443bf4eb8ac659b097fb6cbf5aba49a7b2a90 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 26 Jun 2019 19:17:38 +0100
Subject: [PATCH] Living: remove sendPotionEffects() network crap

---
 src/pocketmine/entity/Living.php                      | 11 -----------
 .../network/mcpe/handler/PreSpawnPacketHandler.php    |  4 +++-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php
index cb2434818..dd034f704 100644
--- a/src/pocketmine/entity/Living.php
+++ b/src/pocketmine/entity/Living.php
@@ -346,17 +346,6 @@ abstract class Living extends Entity implements Damageable{
 		}
 	}
 
-	/**
-	 * Sends the mob's potion effects to the specified player.
-	 *
-	 * @param Player $player
-	 */
-	public function sendPotionEffects(Player $player) : void{
-		foreach($this->effects as $effect){
-			$player->getNetworkSession()->onEntityEffectAdded($this, $effect, false);
-		}
-	}
-
 	protected function onEffectAdded(EffectInstance $effect, bool $replacesOldEffect) : void{
 
 	}
diff --git a/src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php b/src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php
index 9effed61e..6ff83c492 100644
--- a/src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php
+++ b/src/pocketmine/network/mcpe/handler/PreSpawnPacketHandler.php
@@ -86,7 +86,9 @@ class PreSpawnPacketHandler extends PacketHandler{
 		$this->session->syncAttributes($this->player, true);
 		$this->session->syncAvailableCommands();
 		$this->session->syncAdventureSettings($this->player);
-		$this->player->sendPotionEffects($this->player);
+		foreach($this->player->getEffects() as $effect){
+			$this->session->onEntityEffectAdded($this->player, $effect, false);
+		}
 		$this->player->sendData($this->player);
 
 		$this->session->getInvManager()->syncAll();