From d5c5235c18c41e9f6270412f9d3922c26beb400e Mon Sep 17 00:00:00 2001
From: MikiGamer <35080830+MikiGamer@users.noreply.github.com>
Date: Tue, 19 May 2020 17:13:34 +0200
Subject: [PATCH] Changes

---
 datasrc/network.py                       | 2 +-
 src/game/client/components/mapimages.cpp | 4 ++--
 src/game/client/gameclient.cpp           | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/datasrc/network.py b/datasrc/network.py
index 295ed565e..e72f015ea 100644
--- a/datasrc/network.py
+++ b/datasrc/network.py
@@ -17,7 +17,7 @@ GameInfoFlags = [
 	"BUG_DDRACE_INPUT", "BUG_FNG_LASER_RANGE", "BUG_VANILLA_BOUNCE",
 	"PREDICT_FNG", "PREDICT_DDRACE", "PREDICT_DDRACE_TILES", "PREDICT_VANILLA",
 	"ENTITIES_DDNET", "ENTITIES_DDRACE", "ENTITIES_RACE", "ENTITIES_FNG",
-	"ENTITIES_VANILLA", "ENTITIES_BW", "DONT_MASK_ENTITIES",
+	"ENTITIES_VANILLA", "DONT_MASK_ENTITIES", "ENTITIES_BW",
 ]
 ExPlayerFlags = ["AFK", "PAUSED", "SPEC"]
 
diff --git a/src/game/client/components/mapimages.cpp b/src/game/client/components/mapimages.cpp
index b9e6e2a5d..3944c9074 100644
--- a/src/game/client/components/mapimages.cpp
+++ b/src/game/client/components/mapimages.cpp
@@ -104,12 +104,12 @@ IGraphics::CTextureHandle CMapImages::GetEntities()
 		pEntities = "ddrace";
 	else if(GameClient()->m_GameInfo.m_EntitiesRace)
 		pEntities = "race";
+	else if (GameClient()->m_GameInfo.m_EntitiesBW)
+		pEntities = "blockworlds";
 	else if(GameClient()->m_GameInfo.m_EntitiesFNG)
 		pEntities = "fng";
 	else if(GameClient()->m_GameInfo.m_EntitiesVanilla)
 		pEntities = "vanilla";
-	else if(GameClient()->m_GameInfo.m_EntitiesBW)
-		pEntities = "blockworlds";
 
 	if(!m_EntitiesIsLoaded || m_pEntitiesGameType != pEntities)
 	{
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index 4657bdd80..1f43b865d 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -1066,13 +1066,17 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
 		Info.m_EntitiesRace = Flags&GAMEINFOFLAG_ENTITIES_RACE;
 		Info.m_EntitiesFNG = Flags&GAMEINFOFLAG_ENTITIES_FNG;
 		Info.m_EntitiesVanilla = Flags&GAMEINFOFLAG_ENTITIES_VANILLA;
-		Info.m_EntitiesBW = Flags&GAMEINFOFLAG_ENTITIES_BW;
 	}
 	if(Version >= 3)
 	{
 		Info.m_Race = Flags&GAMEINFOFLAG_RACE;
 		Info.m_DontMaskEntities = Flags&GAMEINFOFLAG_DONT_MASK_ENTITIES;
 	}
+
+	if (Version >= 4)
+	{
+		Info.m_EntitiesBW = Flags&GAMEINFOFLAG_ENTITIES_BW;
+	}
 	return Info;
 }