Remove entities from old map when setting a new one

[dragonblocks.git] / engine / init.js

diff --git a/engine/init.js b/engine/init.js
index 349d4670b39693a4c990cca98c2aceb0a4257c99..e8daae4db7d877803d86165d9ec5b636c169bd00 100644 (file)
--- a/engine/init.js
+++ b/engine/init.js
@@ -79,10 +79,6 @@
                throw error;
        };
 
-       dragonblocks.getToken = _ => {
-               return "#" + (Math.random() * 10).toString().replace(".", "");
-       };
-
        dragonblocks.getModInfo = modname => {
                return dragonblocks.mods[modname] || dragonblocks.gamemods[modname];
        };
@@ -116,28 +112,26 @@
                loadingMods[modname] = false;
        };
 
-       dragonblocks.start = selectedMods => {
+       dragonblocks.loadMods = selectedMods = _ => {
+               dragonblocks.loadedMods = {};
+
+               for (let mod in selectedMods)
+                       if (selectedMods[mod])
+                               loadMod(mod);
+
+               for (let mod in dragonblocks.gamemods)
+                       loadMod(mod);
+       };
+
+       dragonblocks.start = worldProperties => {
                dragonblocks.log("Starting");
 
                for (let func of dragonblocks.onStartCallbacks)
                        func();
 
                setTimeout(_ => {
-                       dragonblocks.loadedMods = {};
-
-                       for (let mod in selectedMods)
-                               if (selectedMods[mods])
-                                       loadMod(mod);
-
-                       for (let mod in dragonblocks.gamemods)
-                               loadMod(mod);
-
-                       dragonblocks.map = new dragonblocks.Map();
-                       dragonblocks.map.load();
-
-                       dragonblocks.player = new dragonblocks.Player();
-
-                       dragonblocks.worldIsLoaded || dragonblocks.generateMap();
+                       dragonblocks.world = new dragonblocks.World(worldProperties);
+                       dragonblocks.player = dragonblocks.world.player;
 
                        for (let func of dragonblocks.onStartedCallbacks)
                                func();
@@ -160,7 +154,8 @@
 
                if (dragonblocks.loggedin)
                        setTimeout(_ => {
-                               dragonblocks.save();
+                               dragonblocks.player.removeFromMap();
+                               dragonblocks.world.save();
                                location.reload();
                        });
                else
@@ -184,12 +179,13 @@
                "group",
                "builtin",
                "map_node",
+               "map_display",
                "map",
                "item_stack",
                "inventory",
                "out_stack",
                "inventory_group",
-               "hudbar",
+               "hotbar",
                "inventory_container",
                "creative_inventory",
                "recipe",