From 32ed5530d4874c95e669a94742356d7509d45b12 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 29 Aug 2018 14:42:53 -0400 Subject: [PATCH] Core/Maps: Should fix spam about not being able to unload files --- Source/Game/Collision/Management/VMapManager.cs | 5 +++-- Source/Game/Collision/Models/WorldModel.cs | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Game/Collision/Management/VMapManager.cs b/Source/Game/Collision/Management/VMapManager.cs index 604caaf62..e1a97863f 100644 --- a/Source/Game/Collision/Management/VMapManager.cs +++ b/Source/Game/Collision/Management/VMapManager.cs @@ -236,11 +236,12 @@ namespace Game.Collision { lock (LoadedModelFilesLock) { + filename = filename.TrimEnd('\0'); var model = iLoadedModelFiles.LookupByKey(filename); if (model == null) { WorldModel worldmodel = new WorldModel(); - if (!worldmodel.readFile(VMapPath + filename + ".vmo")) + if (!worldmodel.readFile(VMapPath + filename)) { Log.outError(LogFilter.Server, "VMapManager: could not load '{0}'", filename); return null; @@ -261,7 +262,7 @@ namespace Game.Collision { lock (LoadedModelFilesLock) { - filename = filename.Replace("\0", ""); + filename = filename.TrimEnd('\0'); var model = iLoadedModelFiles.LookupByKey(filename); if (model == null) { diff --git a/Source/Game/Collision/Models/WorldModel.cs b/Source/Game/Collision/Models/WorldModel.cs index cc00f5445..58670987f 100644 --- a/Source/Game/Collision/Models/WorldModel.cs +++ b/Source/Game/Collision/Models/WorldModel.cs @@ -363,10 +363,9 @@ namespace Game.Collision public bool readFile(string filename) { - filename = filename.Replace("\0", ""); if (!File.Exists(filename)) { - filename = filename.Replace(".vmo", ""); + filename = filename + ".vmo"; if (!File.Exists(filename)) return false; }