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

Make effects ends, screw player abilities

Browse source
This commit is contained in:
DemiPixel 2015-12-13 16:19:50 -08:00
parent 0adfc20a1f
commit 7d062ad169
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/lib/plugins/effects.js vendored
View file

@ -16,7 +16,6 @@ module.exports.entity = function(entity, serv) {
duration: duration, duration: duration,
hideParticles: !particles hideParticles: !particles
}; };
console.log(data);
serv._writeArray('entity_effect', data, sendTo); serv._writeArray('entity_effect', data, sendTo);
}; };
@ -36,6 +35,7 @@ module.exports.entity = function(entity, serv) {
amplifier: opt.amplifier || 0, amplifier: opt.amplifier || 0,
duration: opt.duration || 30*20, duration: opt.duration || 30*20,
particles: opt.particles || true, particles: opt.particles || true,
end: Date.now() + (opt.duration || 30*20)*1000/20 // 1000/20 == convert from ticks to milliseconds
}; };
entity.sendEffect(effectId, opt); entity.sendEffect(effectId, opt);
return true; return true;
@ -46,6 +46,13 @@ module.exports.entity = function(entity, serv) {
entity.effects[effectId] = null; entity.effects[effectId] = null;
entity.sendRemoveEffect(effectId, opt); entity.sendRemoveEffect(effectId, opt);
}; };
serv.on('tick', () => {
Object.keys(entity.effects).forEach(effectId => {
var e = entity.effects[effectId];
if (e && e.end <= Date.now()) entity.removeEffect(effectId);
});
});
}; };
module.exports.player = function(player, serv) { module.exports.player = function(player, serv) {

12
src/lib/plugins/updatePositions.js
View file

@ -68,20 +68,20 @@ module.exports.player=function(player)
if (notCancelled) player.sendSelfPosition(); if (notCancelled) player.sendSelfPosition();
} }
player.sendAbilities = () => { player.sendAbilities = () => { // TODO: Fix all of this...
var godmode = player.gameMode == 1 || player.gameMode == 3; var godmode = player.gameMode == 1 || player.gameMode == 3;
var canFly = player.gameMode == 1 || player.gameMode == 3; var canFly = player.gameMode == 1 || player.gameMode == 3;
var isFlying = !player.onGround && canFly; var isFlying = !player.onGround && canFly;
var creativeMode = player.gameMode == 1; var creativeMode = player.gameMode == 1;
var f = (+godmode*8) + (+canFly*4) + (+isFlying*2) + (+creativeMode*1); var f = (+godmode*8) + (+canFly*4) + (+isFlying*2) + (+creativeMode*1);
var walkingSpeed = 4.3/20 * (1 + (player.effects[1] != null ? (player.effects[1].amplifier + 1) : 0) * 0.2) var walkingSpeed = 0.2 * (1 + (player.effects[1] != null ? (player.effects[1].amplifier + 1) : 0) * 0.2)
var flyingSpeed = 1.0/20; var flyingSpeed = 0.1;
console.log(walkingSpeed, flyingSpeed); /*console.log(walkingSpeed, flyingSpeed);
player._client.write('abilities', { player._client.write('abilities', { // FIIIIXXXXXXX
flags: f, flags: f,
walkingSpeed: walkingSpeed, walkingSpeed: walkingSpeed,
flyingSpeed: flyingSpeed flyingSpeed: flyingSpeed
}); });*/
} }
}; };