Fix #2030 (#2054)

* Fix effects being applied multiple times from splash potions

* Remove useless condition from Thrown Potion

src/pocketmine/entity/ThrownPotion.php

@@ -51,24 +51,26 @@ public function __construct(FullChunk $chunk, CompoundTag $nbt, Entity $shooting
 		unset($this->dataProperties[self::DATA_SHOOTER_ID]);
 		$this->setDataProperty(self::DATA_POTION_ID, self::DATA_TYPE_SHORT, $this->getPotionId());
 	}
-	
+
 	public function getPotionId() : int{
 		return (int) $this->namedtag["PotionId"];
 	}
-	
+
 	public function kill(){
-		$color = Potion::getColor($this->getPotionId());
-		$this->getLevel()->addParticle(new SpellParticle($this, $color[0], $color[1], $color[2]));
-		$players = $this->getViewers();
-		foreach($players as $p) {
-			if($p->distance($this) <= 6){
-				foreach(Potion::getEffectsById($this->getPotionId()) as $effect){
-					$p->addEffect($effect);
+		if($this->isAlive()) {
+			$color = Potion::getColor($this->getPotionId());
+			$this->getLevel()->addParticle(new SpellParticle($this, $color[0], $color[1], $color[2]));
+			$players = $this->getViewers();
+			foreach($players as $p) {
+				if($p->distance($this) <= 6) {
+					foreach(Potion::getEffectsById($this->getPotionId()) as $effect) {
+						$p->addEffect($effect);
+					}
 				}
 			}
+
+			parent::kill();
 		}
-
-		parent::kill();
 	}
 
 	public function onUpdate($currentTick){
@@ -87,11 +89,6 @@ public function onUpdate($currentTick){
 			$this->close();
 			$hasUpdate = true;
 		}
-
-		if($this->onGround) {
-			$this->kill();
-			$this->close();
-		}
 
 		$this->timings->stopTiming();