dan/flying-squid
1
0
Fork 0
mirror of https://github.com/danbulant/flying-squid synced 2026-07-07 12:10:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix an async problem with portal generation, check huge portals work

Browse source
This commit is contained in:
Romain Beaumont 2015-12-15 00:20:15 +01:00
parent 067128e8c9
commit a999bbdda1
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/plugins/portal.js
View file

@ -65,8 +65,8 @@ module.exports.player=function(player,serv) {
}, },
async action({bottomLeft,direction,width,height}) { async action({bottomLeft,direction,width,height}) {
var portal=generatePortal(bottomLeft,direction,width,height); var portal=generatePortal(bottomLeft,direction,width,height);
await addPortalToWorld(player.world,portal,[],[],(pos,type) => { await addPortalToWorld(player.world,portal,[],[],async (pos,type) => {
serv.setBlock(player.world,pos,type,0); await serv.setBlock(player.world,pos,type,0);
}); });
} }
}); });

5
src/lib/portal_detector.js
View file

@ -145,10 +145,7 @@ function addPortalToWorld(world,portal,additionalAir,additionalObsidian,setBlock
async function makeWorldWithPortal(portal,additionalAir,additionalObsidian) async function makeWorldWithPortal(portal,additionalAir,additionalObsidian)
{ {
var world=new World(() => new Chunk());
var world=new World();
var chunk=new Chunk();
await world.setColumn(0,0,chunk);
await addPortalToWorld(world,portal,additionalAir,additionalObsidian); await addPortalToWorld(world,portal,additionalAir,additionalObsidian);
return world; return world;

11
test/portal_detector.js
View file

@ -70,6 +70,17 @@ describe("Detect portal", function() {
}); });
portalData.push({
name:"huge simple portal frame z",
bottomLeft:new Vec3(2,1,1),
direction:new Vec3(0,0,1),
width:50,
height:50,
additionalAir:[],
additionalObsidian:[]
});
portalData.forEach(({name,bottomLeft,direction,width,height,additionalAir,additionalObsidian}) => { portalData.forEach(({name,bottomLeft,direction,width,height,additionalAir,additionalObsidian}) => {
var portal=generatePortal(bottomLeft,direction,width,height); var portal=generatePortal(bottomLeft,direction,width,height);
var {bottom,left,right,top,air}=portal; var {bottom,left,right,top,air}=portal;