From 8a93ffbdd9c33d82d7971a6485b3124c21aec288 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Fri, 23 Oct 2015 17:26:25 +0200 Subject: [PATCH 1/2] anvil loading --- app.js | 3 ++- package.json | 8 +++++--- src/lib/serverPlugins/world.js | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app.js b/app.js index cff9fb6..5c85d79 100644 --- a/app.js +++ b/app.js @@ -20,7 +20,8 @@ var options = { logging:settings.logging, generation:settings.generation, 'modpe': settings.modpe, - kickTimeout: settings.kickTimeout ? settings.kickTimeout : 10*1000 + kickTimeout: settings.kickTimeout ? settings.kickTimeout : 10*1000, + regionFolder: settings.regionFolder }; mcServer.createMCServer(options); diff --git a/package.json b/package.json index 9febfd3..880e387 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ }, "scripts": { "prepublish": "gulp", - "test": "mocha --reporter spec" + "test": "mocha --reporter spec", + "postinstall": "node_modules/.bin/babel --optional runtime --recursive --stage 0 -d node_modules/prismarine-world/dist/ node_modules/prismarine-world/src/" }, "keywords": [], "licenses": { @@ -31,14 +32,15 @@ "prismarine-block": "0.1.0", "prismarine-chunk": "0.2.1", "prismarine-entity": "0.1.0", - "prismarine-world": "0.2.0", + "prismarine-world": "git://github.com/PrismarineJS/prismarine-world.git#anvil", "request-promise": "^0.4.3", "requireindex": "~1.0.0", "vec3": "0.1.3", "spiralloop": "1.0.2", "node-dir": "~0.1.9", "uuid-1345": "~0.99.6", - "prismarine-world-sync": "0.1.0" + "prismarine-world-sync": "0.1.0", + "babel": "5.8.23" }, "repository": { "type": "git", diff --git a/src/lib/serverPlugins/world.js b/src/lib/serverPlugins/world.js index b6cde25..918a476 100644 --- a/src/lib/serverPlugins/world.js +++ b/src/lib/serverPlugins/world.js @@ -12,9 +12,9 @@ var generations={ 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); 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); } From cde16a4d25cd629bc8ec0666e273151507d02269 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sat, 24 Oct 2015 03:48:17 +0200 Subject: [PATCH 2/2] use prismarine-world 0.3.0 : enable anvil loading --- package.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 880e387..9e5f971 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,7 @@ }, "scripts": { "prepublish": "gulp", - "test": "mocha --reporter spec", - "postinstall": "node_modules/.bin/babel --optional runtime --recursive --stage 0 -d node_modules/prismarine-world/dist/ node_modules/prismarine-world/src/" + "test": "mocha --reporter spec" }, "keywords": [], "licenses": { @@ -32,15 +31,14 @@ "prismarine-block": "0.1.0", "prismarine-chunk": "0.2.1", "prismarine-entity": "0.1.0", - "prismarine-world": "git://github.com/PrismarineJS/prismarine-world.git#anvil", + "prismarine-world": "0.3.0", "request-promise": "^0.4.3", "requireindex": "~1.0.0", "vec3": "0.1.3", "spiralloop": "1.0.2", "node-dir": "~0.1.9", "uuid-1345": "~0.99.6", - "prismarine-world-sync": "0.1.0", - "babel": "5.8.23" + "prismarine-world-sync": "0.1.0" }, "repository": { "type": "git",