From 221dff8081bc7d89c0a5c92cf36d52816a5112a9 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Tue, 5 Apr 2016 22:06:57 +1000
Subject: [PATCH] Quick fix for some maps not loading in singleplayer.

---
 ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs |  3 ++-
 ClassicalSharp/Rendering/MapRenderer.cs           | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs b/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs
index 7cb366b4a..78857479e 100644
--- a/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs
+++ b/ClassicalSharp/2D/Screens/Menu/LoadLevelScreen.cs
@@ -69,7 +69,8 @@ namespace ClassicalSharp.Gui {
 				}
 			} catch( Exception ex ) {
 				ErrorHandler.LogError( "loading map", ex );
-				game.Chat.Add( "&e/client loadmap: Failed to load map \"" + path + "\"" );
+				string file = Path.GetFileName( path );
+				game.Chat.Add( "&e/client loadmap: Failed to load map \"" + file + "\"" );
 			}
 		}
 	}
diff --git a/ClassicalSharp/Rendering/MapRenderer.cs b/ClassicalSharp/Rendering/MapRenderer.cs
index f91152317..841e8719e 100644
--- a/ClassicalSharp/Rendering/MapRenderer.cs
+++ b/ClassicalSharp/Rendering/MapRenderer.cs
@@ -74,14 +74,16 @@ namespace ClassicalSharp.Renderers {
 		}
 		
 		public void Refresh() {
-			if( chunks != null && !game.World.IsNotLoaded ) {
-				ClearChunkCache();
-				CreateChunkCache();
-			}
 			chunkPos = new Vector3I( int.MaxValue );
+			if( chunks == null || game.World.IsNotLoaded ) return;
+			ClearChunkCache();
+			CreateChunkCache();
 		}
 		
 		void RefreshBorders( int clipLevel ) {
+			chunkPos = new Vector3I( int.MaxValue );
+			if( chunks == null || game.World.IsNotLoaded ) return;
+			
 			int index = 0;
 			for( int z = 0; z < chunksZ; z++ )
 				for( int y = 0; y < chunksY; y++ )
@@ -92,7 +94,6 @@ namespace ClassicalSharp.Renderers {
 					DeleteChunk( unsortedChunks[index] );
 				index++;
 			}
-			chunkPos = new Vector3I( int.MaxValue );
 		}
 		
 		void EnvVariableChanged( object sender, EnvVarEventArgs e ) {