Core/Misc: Misc fixes

Source/Game/Maps/Map.cs

@@ -2340,8 +2340,9 @@ namespace Game.Maps
                         break;
                     case TypeId.GameObject:
                         GameObject go = obj.ToGameObject();
-                        if (go.IsTransport())
-                            RemoveFromMap(go.ToTransport(), true);
+                        Transport transport = go.ToTransport();
+                        if (transport)
+                            RemoveFromMap(transport, true);
                         else
                             RemoveFromMap(go, true);
                         break;
@@ -2721,7 +2722,7 @@ namespace Game.Maps
                 bones = new Corpse();
                 bones.Create(corpse.GetGUID().GetCounter(), this);
 
-                for (byte i = (int)ObjectFields.Guid + 4; i < (int)CorpseFields.End; ++i)                    // don't overwrite guid
+                for (int i = (int)ObjectFields.Guid + 4; i < (int)CorpseFields.End; ++i)                    // don't overwrite guid
                     bones.SetUInt32Value(i, corpse.GetUInt32Value(i));
 
                 bones.SetCellCoord(corpse.GetCellCoord());

Source/Game/Maps/MapUpdater.cs

@@ -38,7 +38,6 @@ namespace Game.Maps
                 _workerThreads[i] = new Thread(WorkerThread);
                 _workerThreads[i].Start();
             }
-
         }
 
         public void Deactivate()
@@ -48,11 +47,8 @@ namespace Game.Maps
             Wait();
 
             _queue.Cancel();
-
             foreach (var thread in _workerThreads)
-            {
                 thread.Join();
-            }
         }
 
         public void Wait()
@@ -96,7 +92,6 @@ namespace Game.Maps
                     return;
 
                 request.Call();
-                UpdateFinished();
             }
         }
     }
@@ -123,11 +118,7 @@ namespace Game.Maps
         public void Call()
         {
             m_map.Update(m_diff);
-        }
-
-        public uint GetId()
-        {
-            return m_map.GetId();
+            m_updater.UpdateFinished();
         }
     }
 }