From 83a41c93e9dede8c187cf841d5618c27e145d2a3 Mon Sep 17 00:00:00 2001
From: Mat <mail@mathias.is>
Date: Thu, 5 Mar 2020 21:33:43 +0200
Subject: Attached entities can't enter portals (#4484)

* Attached entities can't enter portals

* Whitespace fixes
---
 src/Entities/Player.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/Entities/Player.cpp')

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 421eddbd5..07342bd52 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -2029,6 +2029,9 @@ void cPlayer::DoMoveToWorld(const cEntity::sWorldChangeInfo & a_WorldChangeInfo)
 	// Stop all mobs from targeting this player
 	StopEveryoneFromTargetingMe();
 
+	// If player is attached to entity, detach, to prevent client side effects
+	Detach();
+
 	// Prevent further ticking in this world
 	SetIsTicking(false);
 
-- 
cgit v1.2.3