Merge pull request #84 from mhsjlw/world_loading

[WIP] anvil loading
This commit is contained in:
Romain Beaumont 2015-10-24 03:49:01 +02:00
commit b89ab41231
3 changed files with 5 additions and 4 deletions

3
app.js
View file

@ -20,7 +20,8 @@ var options = {
logging:settings.logging, logging:settings.logging,
generation:settings.generation, generation:settings.generation,
'modpe': settings.modpe, 'modpe': settings.modpe,
kickTimeout: settings.kickTimeout ? settings.kickTimeout : 10*1000 kickTimeout: settings.kickTimeout ? settings.kickTimeout : 10*1000,
regionFolder: settings.regionFolder
}; };
mcServer.createMCServer(options); mcServer.createMCServer(options);

View file

@ -31,7 +31,7 @@
"prismarine-block": "0.1.0", "prismarine-block": "0.1.0",
"prismarine-chunk": "0.2.1", "prismarine-chunk": "0.2.1",
"prismarine-entity": "0.1.0", "prismarine-entity": "0.1.0",
"prismarine-world": "0.2.0", "prismarine-world": "0.3.0",
"request-promise": "^0.4.3", "request-promise": "^0.4.3",
"requireindex": "~1.0.0", "requireindex": "~1.0.0",
"vec3": "0.1.3", "vec3": "0.1.3",

View file

@ -12,9 +12,9 @@ var generations={
module.exports = inject; module.exports = inject;
function inject(serv,{generation={"name":"diamond_square","options":{"worldHeight":80}}}={}) { function inject(serv,{regionFolder,generation={"name":"diamond_square","options":{"worldHeight":80}}}={}) {
generation.options.seed=generation.options.seed || Math.random()*Math.pow(2, 32); generation.options.seed=generation.options.seed || Math.random()*Math.pow(2, 32);
serv.emit("seed",generation.options.seed); serv.emit("seed",generation.options.seed);
serv.world = new World(generations[generation.name](generation.options)); serv.world = new World(generations[generation.name](generation.options),regionFolder);
serv._worldSync=new WorldSync(serv.world); serv._worldSync=new WorldSync(serv.world);
} }