From d5a1b4fc8f20b69b77b089c7141d3efa2d92ab9a Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Fri, 23 Aug 2019 20:05:00 +0100
Subject: [PATCH] Fix #9920: Ghost pieces break maps on multiplayer for the
 client (#9928)

---
 src/openrct2/network/Network.cpp | 3 ++-
 test/tests/NetworkLoadSave.cpp   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp
index 92e7e7e2f1..75d1bb51e9 100644
--- a/src/openrct2/network/Network.cpp
+++ b/src/openrct2/network/Network.cpp
@@ -34,7 +34,7 @@
 // This string specifies which version of network stream current build uses.
 // It is used for making sure only compatible builds get connected, even within
 // single OpenRCT2 version.
-#define NETWORK_STREAM_VERSION "7"
+#define NETWORK_STREAM_VERSION "8"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 static Peep* _pickup_peep = nullptr;
@@ -2745,6 +2745,7 @@ bool Network::LoadMap(IStream* stream)
 bool Network::SaveMap(IStream* stream, const std::vector<const ObjectRepositoryItem*>& objects) const
 {
     bool result = false;
+    map_reorganise_elements();
     viewport_set_saved_view();
     try
     {
diff --git a/test/tests/NetworkLoadSave.cpp b/test/tests/NetworkLoadSave.cpp
index 0e65ee504e..f088d58c64 100644
--- a/test/tests/NetworkLoadSave.cpp
+++ b/test/tests/NetworkLoadSave.cpp
@@ -90,6 +90,7 @@ static bool LoadMap(IStream* stream)
 static bool SaveMap(IStream* stream, const std::vector<const ObjectRepositoryItem*>& objects)
 {
     bool result = false;
+    map_reorganise_elements();
     viewport_set_saved_view();
     try
     {