Only resend default texture pack when the url changes, thus meaning we can now avoid the full map refresh for the ClassicalSharp dev builds.

This commit is contained in:
UnknownShadow200 2016-04-03 08:40:32 +10:00
parent 2b96cc8445
commit 98482bebc5

View File

@ -197,6 +197,7 @@ namespace MCGalaxy
} }
} }
string lastUrl = "";
public void SendCurrentMapAppearance() { public void SendCurrentMapAppearance() {
byte edgeBlock = level.EdgeBlock, horBlock = level.HorizonBlock; byte edgeBlock = level.EdgeBlock, horBlock = level.HorizonBlock;
if (edgeBlock >= Block.CpeCount && !hasBlockDefs) if (edgeBlock >= Block.CpeCount && !hasBlockDefs)
@ -210,9 +211,10 @@ namespace MCGalaxy
url = Server.defaultTexturePackUrl == "" ? Server.defaultTerrainUrl : Server.defaultTexturePackUrl; url = Server.defaultTexturePackUrl == "" ? Server.defaultTerrainUrl : Server.defaultTexturePackUrl;
// reset all other textures back to client default. // reset all other textures back to client default.
if (url != lastUrl)
SendSetMapAppearanceV2("", edgeBlock, horBlock, level.EdgeLevel, level.CloudsHeight, level.MaxFogDistance); SendSetMapAppearanceV2("", edgeBlock, horBlock, level.EdgeLevel, level.CloudsHeight, level.MaxFogDistance);
if (url != "")
SendSetMapAppearanceV2(url, edgeBlock, horBlock, level.EdgeLevel, level.CloudsHeight, level.MaxFogDistance); SendSetMapAppearanceV2(url, edgeBlock, horBlock, level.EdgeLevel, level.CloudsHeight, level.MaxFogDistance);
lastUrl = url;
} else { } else {
string url = level.terrainUrl == "" ? Server.defaultTerrainUrl : level.terrainUrl; string url = level.terrainUrl == "" ? Server.defaultTerrainUrl : level.terrainUrl;
SendSetMapAppearance(url, edgeBlock, horBlock, level.EdgeLevel); SendSetMapAppearance(url, edgeBlock, horBlock, level.EdgeLevel);