From 3d0dbff87b002a2a7409cb771ddc07c8e880f070 Mon Sep 17 00:00:00 2001
From: RednedEpic <redned235@gmail.com>
Date: Sat, 23 May 2020 23:45:39 -0500
Subject: [PATCH] Remove effects on world/server change (Fixes #467)

The server re-sends these effects upon joining the new world or server.
---
 .../org/geysermc/connector/utils/DimensionUtils.java  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java b/connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java
index bc7745ca9..6c8d9f944 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/DimensionUtils.java
@@ -25,6 +25,7 @@
 
 package org.geysermc.connector.utils;
 
+import com.github.steveice10.mc.protocol.data.game.entity.Effect;
 import com.nukkitx.math.vector.Vector3i;
 import com.nukkitx.protocol.bedrock.packet.*;
 import org.geysermc.connector.entity.Entity;
@@ -59,6 +60,16 @@ public class DimensionUtils {
         session.setSpawned(false);
         session.setLastChunkPosition(null);
 
+        for (Effect effect : session.getPlayerEntity().getEffectCache().getEntityEffects().keySet()) {
+            MobEffectPacket mobEffectPacket = new MobEffectPacket();
+            mobEffectPacket.setEvent(MobEffectPacket.Event.REMOVE);
+            mobEffectPacket.setRuntimeEntityId(session.getPlayerEntity().getGeyserId());
+            mobEffectPacket.setEffectId(EntityUtils.toBedrockEffectId(effect));
+            session.sendUpstreamPacket(mobEffectPacket);
+        }
+        // Effects are re-sent from server
+        session.getPlayerEntity().getEffectCache().getEntityEffects().clear();
+
         //let java server handle portal travel sound
         StopSoundPacket stopSoundPacket = new StopSoundPacket();
         stopSoundPacket.setStoppingAllSound(true);