From 7d4934534e9c58a111215859ba83c32a9bc0fa8a Mon Sep 17 00:00:00 2001 From: Mat Date: Thu, 5 Mar 2020 12:52:34 +0200 Subject: Stabilise MoveToWorld (#4004) * Stabilise MoveToWorld * Fix comments and deprecate ScheduleMoveToWorld * Enhanced thread safety for m_WorldChangeInfo * Return unique_ptr from cAtomicUniquePtr::exchange * cWorld now calls entity cEntity::OnAddToWorld and cEntity::OnRemoveFromWorld. Allows broadcasting entities added to the world from the world's tick thread. This also factors out some common code from cEntity::DoMoveToWorld and cEntity::Initialize. As a consequence, cEntity::Destroy(false) (i.e. Destroying the entity without broadcasting) is impossible. This isn't used anywhere in Cuberite so it's now deprecated. * Update entity position after removing it from the world. Fixes broadcasts being sent to the wrong chunk. * Fix style * cEntity: Update LastSentPosition when sending spawn packet * Add Wno-deprecated-declarations to the lua bindings * Kill uses of ScheduleMoveToWorld --- src/NetherPortalScanner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/NetherPortalScanner.cpp') diff --git a/src/NetherPortalScanner.cpp b/src/NetherPortalScanner.cpp index 9625ed7cf..78cdb2f02 100644 --- a/src/NetherPortalScanner.cpp +++ b/src/NetherPortalScanner.cpp @@ -296,7 +296,7 @@ void cNetherPortalScanner::OnDisabled(void) } FLOGD("Placing player at {0}", Position); - m_Entity->ScheduleMoveToWorld(m_World, Position, true); + m_Entity->MoveToWorld(m_World, Position, true); delete this; } -- cgit v1.2.3