Don't remove entities when changing map

Author: UnknownShadow200

fCraft/Commands/WorldCommands.cs

@@ -807,11 +807,8 @@ private static void GenHandler(Player player, CommandReader cmd) {
                     Logger.Log(LogType.UserActivity,
                         "Gen: Asked {0} to confirm replacing the map of world {1} (\"this map\").",
                         player.Name, playerWorld.Name);
-                    if (!Entity.AnyIn(player.World)) {
-                        player.Confirm(cmd, "Replace THIS MAP with a generated one ({0})?", templateFullName);
-                    } else {
-                        player.Confirm(cmd, "Replace THIS MAP with a generated one ({0})?&NThis will also remove all the Entities/Bots on the world.", templateFullName);
-                    }
+
+                    player.Confirm(cmd, "Replace THIS MAP with a generated one ({0})?", templateFullName);
                     return;
                 }
             } else {
@@ -955,11 +952,8 @@ private static void GenHMHandler(Player player, CommandReader cmd) {
                     Logger.Log(LogType.UserActivity,
                         "GenHM: Asked {0} to confirm replacing the map of world {1} (\"this map\").",
                         player.Name, playerWorld.Name);
-                    if (!Entity.AnyIn(player.World)) {
-                        player.Confirm(cmd, "Replace THIS MAP with a generated one (HeightMap: &9{0}&S)?", url);
-                    } else {
-                        player.Confirm(cmd, "Replace THIS MAP with a generated one (HeightMap: &9{0}&S)?&NThis will also remove all the Entities/Bots on the world.", url);
-                    }
+                    
+                	player.Confirm(cmd, "Replace THIS MAP with a generated one (HeightMap: &9{0}&S)?", url);
                     return;
                 }
 
@@ -3411,13 +3405,8 @@ static void MWReset(Player player, CommandReader cmd) {
                 player.Message("You have no personal worlds by that number: {0}", num); return;
             }
             if (!cmd.IsConfirmed) {
-                if (!Entity.AnyIn(player.World)) {
-                    player.Confirm(cmd, "This will reset your personal world:   " + mapName +
-                                   "&N&cThis cannot be undone!");
-                } else {
-                    player.Confirm(cmd, "This will reset your personal world:   " + mapName +
-                                   "&N&cThis cannot be undone!&NThis will also remove all the Entities/Bots on the world.");
-                }
+                player.Confirm(cmd, "This will reset your personal world:   " + mapName +
+                               "&N&cThis cannot be undone!");
                 return;
             }
 

fCraft/World/Entity.cs

@@ -101,9 +101,6 @@ public static IEnumerable<Entity> AllIn(string worldName) {
         /// <summary> Enumerable of all entities that are in the given world. </summary>
         public static IEnumerable<Entity> AllIn(World world) { return AllIn(world.Name); }
 
-        /// <summary> Returns whether any entities exist in the given world. </summary>
-        public static bool AnyIn(World world) { return AllIn(world).Any(); }
-
         /// <summary> Retrieves the entity who is located in the given world,
         /// and whose name caselessly matches the input. </summary>
         public static Entity Find(World world, string name) {

fCraft/World/World.cs

@@ -272,7 +272,7 @@ public World ChangeMap( [NotNull] Map newMap ) {
                     BlockDB.Clear();
                     BlockDB.World = newWorld;
                 }
-                if (Entity.AnyIn(this)) Entity.RemoveAllIn(this);
+
                 foreach ( Player player in Players ) {
                     player.JoinWorld( newWorld, WorldChangeReason.Rejoin );
                 }