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

Change to async emits

Browse source
This commit is contained in:
DemiPixel 2015-11-23 11:23:50 -08:00
parent fa99c91551
commit a68b10bfa0
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/index.js
View file

@ -3,6 +3,7 @@ var EventEmitter = require('events').EventEmitter;
var path = require('path'); var path = require('path');
var requireIndex = require('requireindex'); var requireIndex = require('requireindex');
var plugins = requireIndex(path.join(__dirname, 'lib', 'plugins')); var plugins = requireIndex(path.join(__dirname, 'lib', 'plugins'));
require('emit-then').register();
if (process.env.NODE_ENV === 'dev'){ if (process.env.NODE_ENV === 'dev'){
require('longjohn'); require('longjohn');
} }

10
src/lib/behavior.js
View file

@ -13,12 +13,12 @@ module.exports = (obj) => {
defaultCancel = dC; defaultCancel = dC;
} }
await obj.emit(eventName + '_cancel', data, cancel); await obj.emitThen(eventName + '_cancel', data, cancel).catch((err)=> setTimeout(() => {throw err;},0));
await obj.emit(eventName, data, cancelled, cancelCount); await obj.emitThen(eventName, data, cancelled, cancelCount).catch((err)=> setTimeout(() => {throw err;},0));
if (!hiddenCancelled && !cancelled) await func(data); if (!hiddenCancelled && !cancelled) await func(data).catch((err)=> setTimeout(() => {throw err;},0));
else if (cancelFunc && defaultCancel) cancelFunc(data); else if (cancelFunc && defaultCancel) await cancelFunc(data).catch((err)=> setTimeout(() => {throw err;},0));
await obj.emit(eventName + '_done', data, cancelled); await obj.emitThen(eventName + '_done', data, cancelled).catch((err)=> setTimeout(() => {throw err;},0));
} }
} }

18
src/lib/plugins/sound.js
View file

@ -53,16 +53,14 @@ module.exports.player=function(player,serv) {
serv.playNoteBlock(data.note, player.world, reference); serv.playNoteBlock(data.note, player.world, reference);
}); });
player.on('dig_cancel', async ({position, reference}, cancel) => { player.on('dig_cancel', async ({position}, cancel) => {
if (status != 0 || player.gameMode == 1) return; var id = await player.world.getBlockType(position);
return player.world.getBlockType(reference).then((id) => { if (id != 25) return;
if (id != 25) return; cancel(false);
cancel(false); if (!player.world.blockEntityData[position.toString()]) player.world.blockEntityData[position.toString()] = {};
if (!player.world.blockEntityData[reference.toString()]) player.world.blockEntityData[reference.toString()] = {}; var data = player.world.blockEntityData[position.toString()];
var data = player.world.blockEntityData[reference.toString()]; if (typeof data.note == 'undefined') data.note = 0;
if (typeof data.note == 'undefined') data.note = 0; serv.playNoteBlock(data.note ,player.world, position);
serv.playNoteBlock(data.not,player.world, reference, data.note);
}).catch((err)=> setTimeout(() => {throw err;},0));
}); });