Browse Source

eslint fixes

tags/v0.2.1^2
big bad waffle 5 years ago
parent
commit
043642da41
42 changed files with 142 additions and 203 deletions
  1. +3
    -2
      .eslintrc
  2. +1
    -1
      src/server/combat/combat.js
  3. +1
    -3
      src/server/components/aggro.js
  4. +21
    -0
      src/server/components/componentBase.js
  5. +2
    -3
      src/server/components/components.js
  6. +1
    -1
      src/server/components/door.js
  7. +2
    -12
      src/server/components/equipment.js
  8. +0
    -1
      src/server/components/extensions/socialCommands.js
  9. +1
    -9
      src/server/components/gatherer.js
  10. +2
    -6
      src/server/components/inventory.js
  11. +0
    -2
      src/server/components/mob.js
  12. +0
    -5
      src/server/components/spellbook.js
  13. +2
    -9
      src/server/components/stats.js
  14. +1
    -1
      src/server/components/wardrobe.js
  15. +1
    -1
      src/server/components/workbench.js
  16. +0
    -2
      src/server/config/factions/akarei.js
  17. +0
    -1
      src/server/config/factions/gaekatla.js
  18. +0
    -4
      src/server/config/itemEffects/alwaysCrit.js
  19. +2
    -2
      src/server/config/maps/fjolarok/events/fishingTournament.js
  20. +0
    -2
      src/server/config/prophecies/titangrip.js
  21. +0
    -2
      src/server/config/quests/templates/questGatherResource.js
  22. +1
    -3
      src/server/config/quests/templates/questLootGen.js
  23. +3
    -5
      src/server/config/spells/spellArcaneBarrier.js
  24. +1
    -1
      src/server/config/spells/spellCocoon.js
  25. +3
    -5
      src/server/config/spells/spellHealingCircle.js
  26. +1
    -1
      src/server/config/spells/spellHolyVengeance.js
  27. +5
    -16
      src/server/config/spells/spellSlowBlast.js
  28. +1
    -1
      src/server/config/spells/spellSmite.js
  29. +0
    -2
      src/server/config/spells/spellSmokeBomb.js
  30. +0
    -1
      src/server/config/spells/spellTemplate.js
  31. +0
    -2
      src/server/config/spells/spellTrailDash.js
  32. +2
    -2
      src/server/index.js
  33. +0
    -2
      src/server/items/generators/spellbook.js
  34. +54
    -45
      src/server/misc/helpers.js
  35. +1
    -6
      src/server/misc/mail.js
  36. +0
    -1
      src/server/misc/mods.js
  37. +0
    -34
      src/server/mods/event-halloween/maps/fjolarok/events/halloween.js
  38. +1
    -1
      src/server/mods/event-halloween/spells/spellScatterPumpkinPieces.js
  39. +25
    -0
      src/server/objects/objBase.js
  40. +1
    -1
      src/server/security/connections.js
  41. +0
    -2
      src/server/world/customMap.js
  42. +3
    -3
      src/server/world/physics.js

+ 3
- 2
.eslintrc View File

@@ -58,7 +58,8 @@
"atlas": false,
"instancer": false,
"leaderboard": false,
"clientConfig": false
"clientConfig": false,
"random": false
},

"rules": {
@@ -133,7 +134,7 @@
"no-undef-init": 2,
"no-undef": 1,
"no-undefined": 1,
"no-unused-vars": 1,
"no-unused-vars": [1, {"args": "none"}],
"no-use-before-define": 2,
"no-mixed-requires": [2,false],
"no-new-require": 2,


+ 1
- 1
src/server/combat/combat.js View File

@@ -34,7 +34,7 @@ module.exports = {
let statType = config.statType;
if (!(statType instanceof Array))
statType = [statType];
let dmg = 0;
statType.forEach(function (s) {
statValue += srcValues[s];
});


+ 1
- 3
src/server/components/aggro.js View File

@@ -89,7 +89,6 @@ module.exports = {

//find mobs in range
let range = this.range;
let faction = this.faction;
let inRange = this.physics.getArea(x - range, y - range, x + range, y + range, (c => (((!c.player) || (!obj.player)) && (!obj.dead) && (c.aggro) && (c.aggro.willAutoAttack(obj)))));

if (inRange.length === 0)
@@ -100,7 +99,7 @@ module.exports = {
let enemy = inRange[i];

//The length could change
lLen = list.length;
let lLen = list.length;
for (let j = 0; j < lLen; j++) {
//Set the enemy to null so we need we need to continue
if (list[j].obj === enemy)
@@ -244,7 +243,6 @@ module.exports = {
this.list = [];
},
unAggro: function (obj, amount) {
let oId = obj.id;
let list = this.list;
let lLen = list.length;



+ 21
- 0
src/server/components/componentBase.js View File

@@ -0,0 +1,21 @@
module.exports = {
toString: function () {
let res = {};

for (let p in this) {
if (['type', 'obj', 'physics', 'objects', 'syncer'].indexOf(p) > -1)
continue;

let val = this[p];
let stringVal = (val && val.toString) ? val.toString() : val;
const type = typeof(val);

if (
type !== 'function'
)
res[p] = stringVal;
}

return res;
}
};

+ 2
- 3
src/server/components/components.js View File

@@ -1,6 +1,7 @@
let fileLister = require('../misc/fileLister');
let events = require('../misc/events');
let pathUtilities = require('path');
const componentBase = require('./componentBase');

let onReady = null;

@@ -28,14 +29,12 @@ module.exports = {
},

getComponentFile: function (path) {
let fileName = pathUtilities.basename(path);
fileName = fileName.replace('.js', '');

let cpn = require(path);
this.onGetComponent(cpn);
},

onGetComponent: function (template) {
template = extend(true, {}, componentBase, template);
this.components[template.type] = template;
}
};

+ 1
- 1
src/server/components/door.js View File

@@ -23,7 +23,7 @@ module.exports = {
this.obj.instance.objects.notifyCollisionChange(this.obj.x, this.obj.y, true);
}

let o = this.obj.instance.objects.buildObjects([{
this.obj.instance.objects.buildObjects([{
properties: {
x: this.obj.x - 1,
y: this.obj.y - 1,


+ 2
- 12
src/server/components/equipment.js View File

@@ -1,5 +1,3 @@
let generatorStats = require('../items/generators/stats');

module.exports = {
type: 'equipment',

@@ -31,8 +29,6 @@ module.exports = {
if (!this.doAutoEq)
return;

let stats = this.obj.stats.values;

let item = this.obj.inventory.findItem(itemId);
if (!item)
return;
@@ -113,15 +109,12 @@ module.exports = {
slot = 'finger-2';
}

let spellId = null;
let currentEqId = this.eq[slot];
let currentEq = this.obj.inventory.findItem(currentEqId);
if (currentEq === item)
return;
if (currentEqId != null) {
spellId = currentEq.spellId;
if (currentEqId != null)
this.unequip(currentEqId);
}

let stats = item.stats;
for (let s in stats) {
@@ -181,11 +174,8 @@ module.exports = {
},
unequip: function (itemId) {
let item = itemId;
let slot = null;
if (typeof (itemId) === 'object') {
slot = itemId.slot;
if (typeof (itemId) === 'object')
itemId = itemId.itemId;
}

if (item.id == null)
item = this.obj.inventory.findItem(itemId);


+ 0
- 1
src/server/components/extensions/socialCommands.js View File

@@ -1,6 +1,5 @@
let roles = require('../../config/roles');
let generator = require('../../items/generator');
let random = require('../../misc/random');
let configSlots = require('../../items/config/slots');
let factions = require('../../config/factions');
let connections = require('../../security/connections');


+ 1
- 9
src/server/components/gatherer.js View File

@@ -107,9 +107,6 @@ module.exports = {
this.obj.syncer.set(false, 'gatherer', 'progress', 100);

if (isFish) {
let rod = this.obj.equipment.eq.tool;
rod = this.obj.inventory.findItem(rod);

let catchChance = 40 + this.obj.stats.values.catchChance;
if (~~(Math.random() * 100) >= catchChance) {
process.send({
@@ -156,8 +153,6 @@ module.exports = {
}

if (isFish) {
let rod = this.obj.equipment.eq.tool;
rod = this.obj.inventory.findItem(rod);
let itemChance = 1 + this.obj.stats.values.fishItems;
if (~~(Math.random() * 100) < itemChance) {
gatherResult.items = [{
@@ -227,13 +222,10 @@ module.exports = {
fish: 'fish for'
}[nodeType]);

let success = true;
if (nodeType === 'fish') {
let rod = this.obj.equipment.eq.tool;
if (rod == null) {
success = false;
if (rod == null)
msg = 'You need a fishing rod to fish';
}
}

process.send({


+ 2
- 6
src/server/components/inventory.js View File

@@ -1,7 +1,6 @@
let generator = require('../items/generator');
let salvager = require('../items/salvager');
let enchanter = require('../items/enchanter');
let objects = require('../objects/objects');
let classes = require('../config/spirits');
let mtx = require('../mtx/mtx');
let factions = require('../config/factions');
@@ -865,9 +864,9 @@ module.exports = {
}

let blueprint = this.blueprint;
let magicFind = (blueprint.magicFind || 0);

let savedItems = extend(true, [], this.items);
let instancedItems = extend(true, [], this.items);
this.items = [];

let dropEvent = {
@@ -877,7 +876,6 @@ module.exports = {
playerObject.fireEvent('beforeGenerateLoot', dropEvent);

if ((!blueprint.noRandom) || (blueprint.alsoRandom)) {
let magicFind = (blueprint.magicFind || 0);
let bonusMagicFind = killSource.stats.values.magicFind;

let rolls = blueprint.rolls;
@@ -897,7 +895,7 @@ module.exports = {
};

let statValues = this.obj.stats.values;
useItem = generator.generate(itemBlueprint, statValues.level);
let useItem = generator.generate(itemBlueprint, statValues.level);

this.getItem(useItem);
}
@@ -940,8 +938,6 @@ module.exports = {
giveItems: function (obj, hideMessage) {
let objInventory = obj.inventory;

let messages = [];

let items = this.items;
let iLen = items.length;
for (let i = 0; i < iLen; i++) {


+ 0
- 2
src/server/components/mob.js View File

@@ -1,5 +1,3 @@
let itemGenerator = require('../items/generator');

let abs = Math.abs.bind(Math);
let rnd = Math.random.bind(Math);
let max = Math.max.bind(Math);


+ 0
- 5
src/server/components/spellbook.js View File

@@ -40,8 +40,6 @@ module.exports = {
die: function () {
this.auto = [];

let mana = this.obj.stats.values.mana;

this.spells.forEach(function (s) {
let reserve = s.manaReserve;

@@ -204,7 +202,6 @@ module.exports = {

if (exists) {
if ((exists.manaReserve) && (exists.active)) {
let mana = this.obj.stats.values.mana;
let reserve = exists.manaReserve;

if (reserve.percentage)
@@ -314,7 +311,6 @@ module.exports = {
this.sendAnnouncement('Insufficient mana to cast spell');
success = false;
} else if (spell.manaReserve) {
let mana = this.obj.stats.values.mana;
let reserve = spell.manaReserve;

if (reserve.percentage) {
@@ -453,7 +449,6 @@ module.exports = {
continue;
}

let spell = this.spells[a.spell];
if (this.cast(a, true))
didCast = true;
}


+ 2
- 9
src/server/components/stats.js View File

@@ -171,18 +171,12 @@ module.exports = {

if (values.mana < manaMax) {
values.mana += regenMana;
//Show others what mana is?
let onlySelf = true;
if (this.obj.player)
onlySelf = false;
this.obj.syncer.setObject(onlySelf, 'stats', 'values', 'mana', values.mana);
this.obj.syncer.setObject(!this.obj.player, 'stats', 'values', 'mana', values.mana);
}

if (values.mana > manaMax) {
values.mana = manaMax;
if (this.obj.player)
onlySelf = false;
this.obj.syncer.setObject(onlySelf, 'stats', 'values', 'mana', values.mana);
this.obj.syncer.setObject(!this.obj.player, 'stats', 'values', 'mana', values.mana);
}
},

@@ -341,7 +335,6 @@ module.exports = {

//Who should get xp?
let aggroList = target.aggro.list;
let hpMax = target.stats.values.hpMax;
let aLen = aggroList.length;
for (let i = 0; i < aLen; i++) {
let a = aggroList[i];


+ 1
- 1
src/server/components/wardrobe.js View File

@@ -4,7 +4,7 @@ module.exports = {
type: 'wardrobe',

init: function (blueprint) {
let o = this.obj.instance.objects.buildObjects([{
this.obj.instance.objects.buildObjects([{
properties: {
x: this.obj.x - 1,
y: this.obj.y - 1,


+ 1
- 1
src/server/components/workbench.js View File

@@ -8,7 +8,7 @@ module.exports = {
init: function (blueprint) {
this.craftType = blueprint.type;

let o = this.obj.instance.objects.buildObjects([{
this.obj.instance.objects.buildObjects([{
properties: {
x: this.obj.x - 1,
y: this.obj.y - 1,


+ 0
- 2
src/server/config/factions/akarei.js View File

@@ -1,5 +1,3 @@
let spawners = require('../../world/spawners');
let mobBuilder = require('../../world/mobBuilder');
let combat = require('../../combat/combat');

module.exports = {


+ 0
- 1
src/server/config/factions/gaekatla.js View File

@@ -1,4 +1,3 @@
let spawners = require('../../world/spawners');
let mobBuilder = require('../../world/mobBuilder');

module.exports = {


+ 0
- 4
src/server/config/itemEffects/alwaysCrit.js View File

@@ -1,14 +1,10 @@
module.exports = {
events: {
onGetText: function (item) {
let rolls = item.effects.find(e => (e.type === 'alwaysCrit')).rolls;

return 'your hits always crit';
},

onBeforeCalculateDamage: function (item, damage, target) {
let rolls = item.effects.find(e => (e.type === 'alwaysCrit')).rolls;

damage.crit = true;
}
}


+ 2
- 2
src/server/config/maps/fjolarok/events/fishingTournament.js View File

@@ -158,10 +158,10 @@ module.exports = {

getRank: function (event, playerName) {
let ranks = event.ranks;
if (!event.ranks)
if (!ranks)
return -1;

return (event.ranks[playerName] || -1);
return (ranks[playerName] || -1);
}
},



+ 0
- 2
src/server/config/prophecies/titangrip.js View File

@@ -1,5 +1,3 @@
let generatorStats = require('../../items/generators/stats');

module.exports = {
type: 'titangrip',



+ 0
- 2
src/server/config/quests/templates/questGatherResource.js View File

@@ -1,5 +1,3 @@
let slots = require('../../../items/generators/slots');

module.exports = {
type: 'gatherResource',



+ 1
- 3
src/server/config/quests/templates/questLootGen.js View File

@@ -1,5 +1,3 @@
let slots = require('../../../items/generators/slots');

module.exports = {
type: 'lootGen',

@@ -13,7 +11,7 @@ module.exports = {
build: function () {
if ((!this.mobName) || (!this.item)) {
let mobTypes = this.obj.instance.spawners.zone.mobs;
let mobCounts = this.obj.instance.spawners.mobTypes;
let keys = Object.keys(mobTypes).filter(function (m) {
let mobBlueprint = mobTypes[m];



+ 3
- 5
src/server/config/spells/spellArcaneBarrier.js View File

@@ -33,8 +33,6 @@ let cpnArcanePatch = {
},

update: function () {
let stats = this.caster.stats;

let contents = this.contents;
let cLen = contents.length;
for (let i = 0; i < cLen; i++) {
@@ -66,10 +64,10 @@ module.exports = {
let x = target.x;
let y = target.y;

let objects = this.obj.instance.objects;
let objects = obj.instance.objects;
let patches = [];

let physics = this.obj.instance.physics;
let physics = obj.instance.physics;

for (let i = x - radius; i <= x + radius; i++) {
let dx = Math.abs(x - i);
@@ -99,7 +97,7 @@ module.exports = {
},
extraProperties: {
arcanePatch: {
caster: this.obj,
caster: obj,
spell: this
}
}


+ 1
- 1
src/server/config/spells/spellCocoon.js View File

@@ -46,7 +46,7 @@ module.exports = {
if (this.obj.destroyed)
return;

let targetEffect = target.effects.addEffect({
target.effects.addEffect({
type: 'cocoon',
ttl: this.ttl,
source: this.obj


+ 3
- 5
src/server/config/spells/spellHealingCircle.js View File

@@ -37,8 +37,6 @@ let cpnHealPatch = {
},

update: function () {
let stats = this.caster.stats;

let contents = this.contents;
let cLen = contents.length;
for (let i = 0; i < cLen; i++) {
@@ -72,10 +70,10 @@ module.exports = {
let x = target.x;
let y = target.y;

let objects = this.obj.instance.objects;
let objects = obj.instance.objects;
let patches = [];

let physics = this.obj.instance.physics;
let physics = obj.instance.physics;

for (let i = x - radius; i <= x + radius; i++) {
let dx = Math.abs(x - i);
@@ -105,7 +103,7 @@ module.exports = {
},
extraProperties: {
healPatch: {
caster: this.obj,
caster: obj,
spell: this
}
}


+ 1
- 1
src/server/config/spells/spellHolyVengeance.js View File

@@ -23,7 +23,7 @@ module.exports = {
}, -1);
}

let selfEffect = target.effects.addEffect({
target.effects.addEffect({
type: 'holyVengeance',
ttl: this.duration
});


+ 5
- 16
src/server/config/spells/spellSlowBlast.js View File

@@ -1,14 +1,3 @@
let cpnFirePatch = {
type: 'firePatch',

collisionEnter: function (o) {
if ((o.player) || (!o.stats))
return;

o.stats.takeDamage(amount, 1, this.caster);
}
};

module.exports = {
type: 'slowBlast',

@@ -33,15 +22,15 @@ module.exports = {
return;
} this.intCd = this.intCdMax;

let obj = this.obj;

let x = obj.x;
let y = obj.y;

for (let a = 0; a < this.thickness; a++) {
this.radius++;
let radius = this.radius;

let obj = this.obj;

let x = obj.x;
let y = obj.y;

let physics = obj.instance.physics;
let syncer = obj.instance.syncer;



+ 1
- 1
src/server/config/spells/spellSmite.js View File

@@ -44,7 +44,7 @@ module.exports = {
let damage = this.getDamage(target);
target.stats.takeDamage(damage, this.threatMult, this.obj);

let targetEffect = target.effects.addEffect({
target.effects.addEffect({
type: 'stunned',
ttl: this.stunDuration
});


+ 0
- 2
src/server/config/spells/spellSmokeBomb.js View File

@@ -32,8 +32,6 @@ let cpnSmokePatch = {
if (this.caster.destroyed)
return;

let stats = this.caster.stats;

let contents = this.contents;
for (let i = 0; i < contents.length; i++) {
let c = contents[i];


+ 0
- 1
src/server/config/spells/spellTemplate.js View File

@@ -1,4 +1,3 @@
let spellCallbacks = require('./spellCallbacks');
let combat = require('../../combat/combat');

module.exports = {


+ 0
- 2
src/server/config/spells/spellTrailDash.js View File

@@ -29,8 +29,6 @@ let cpnSpikePatch = {
if (this.caster.destroyed)
return;

let stats = this.caster.stats;

let contents = this.contents;
let cLen = contents.length;
for (let i = 0; i < cLen; i++) {


+ 2
- 2
src/server/index.js View File

@@ -1,8 +1,8 @@
let globals = require('./globals');
require('./globals');

let server = require('./server');
let components = require('./components/components');
let mods = require('./misc/mods');
let mtx = require('./mtx/mtx');
let animations = require('./config/animations');
let skins = require('./config/skins');
let factions = require('./config/factions');


+ 0
- 2
src/server/items/generators/spellbook.js View File

@@ -2,8 +2,6 @@ let spells = require('../../config/spells');
let spellsConfig = require('../../config/spellsConfig');
let configTypes = require('../config/types');

let maxQuality = 5;

module.exports = {
generate: function (item, blueprint) {
blueprint = blueprint || {};


+ 54
- 45
src/server/misc/helpers.js View File

@@ -1,68 +1,77 @@
Array.prototype.firstIndex = function (callback, thisArg) {
let T = thisArg;
let O = Object(this);
let len = O.length >>> 0;
Object.defineProperty(Array.prototype, 'firstIndex', {
enumerable: false,
value: function (callback, thisArg) {
let T = thisArg;
let O = Object(this);
let len = O.length >>> 0;

let k = 0;
let k = 0;

while (k < len) {
let kValue;
while (k < len) {
let kValue;

if (k in O) {
kValue = O[k];
if (k in O) {
kValue = O[k];

if (callback.call(T, kValue, k, O))
return k;
if (callback.call(T, kValue, k, O))
return k;
}
k++;
}
k++;
}

return -1;
};
return -1;
}
});

Array.prototype.spliceWhere = function (callback, thisArg) {
let T = thisArg;
let O = Object(this);
let len = O.length >>> 0;
Object.defineProperty(Array.prototype, 'spliceWhere', {
enumerable: false,
value: function (callback, thisArg) {
let T = thisArg;
let O = Object(this);
let len = O.length >>> 0;

let k = 0;
let k = 0;

while (k < len) {
let kValue;
while (k < len) {
let kValue;

if (k in O) {
kValue = O[k];
if (k in O) {
kValue = O[k];

if (callback.call(T, kValue, k, O)) {
O.splice(k, 1);
k--;
if (callback.call(T, kValue, k, O)) {
O.splice(k, 1);
k--;
}
}
k++;
}
k++;
}
};
}
});

Array.prototype.spliceFirstWhere = function (callback, thisArg) {
let T = thisArg;
let O = Object(this);
let len = O.length >>> 0;
Object.defineProperty(Array.prototype, 'spliceFirstWhere', {
enumerable: false,
value: function (callback, thisArg) {
let T = thisArg;
let O = Object(this);
let len = O.length >>> 0;

let k = 0;
let k = 0;

while (k < len) {
let kValue;
while (k < len) {
let kValue;

if (k in O) {
kValue = O[k];
if (k in O) {
kValue = O[k];

if (callback.call(T, kValue, k, O)) {
O.splice(k, 1);
return kValue;
if (callback.call(T, kValue, k, O)) {
O.splice(k, 1);
return kValue;
}
}
k++;
}
k++;
}
};
}
});
module.exports = {
get2dArray: function (w, h, def) {


+ 1
- 6
src/server/misc/mail.js View File

@@ -64,8 +64,7 @@ module.exports = {
i--;
}
}
} else
console.log(player.name + ' has no stash');
}
} else {
if ((r.msg) && (!sentMessages.some(s => (s === r.msg)))) {
player.instance.syncer.queue('onGetMessages', {
@@ -120,10 +119,6 @@ module.exports = {
if (!items.push)
items = [items];

let player = null;
if (this.instance)
player = this.instance.objects.objects.find(o => (o.name === playerName));

io.get({
ent: playerName,
field: 'mail',


+ 0
- 1
src/server/misc/mods.js View File

@@ -1,6 +1,5 @@
let fileLister = require('../misc/fileLister');
let events = require('../misc/events');
let util = require('util');

let cbDone = null;



+ 0
- 34
src/server/mods/event-halloween/maps/fjolarok/events/halloween.js View File

@@ -1,37 +1,3 @@
let dropsConfig = {
//mtx
summonPumpkinSkeleton: {
name: 'Summon Pumpkin Skeleton',
type: 'mtx',
effects: [{
mtx: 'summonPumpkinSkeleton'
}],
spritesheet: 'FOLDERNAME/images/items.png',
sprite: [3, 0],
noDrop: true,
noDestroy: true,
noSalvage: true
},

hauntedIceSpear: {
name: 'Haunted Ice Spear',
type: 'mtx',
effects: [{
mtx: 'hauntedIceSpear'
}],
spritesheet: 'FOLDERNAME/images/items.png',
sprite: [3, 0],
noDrop: true,
noDestroy: true,
noSalvage: true
}
};

let gatherDrops = {
summonPumpkinSkeleton: 0.001,
hauntedIceSpear: 0.001
};

module.exports = {
name: 'Soul\'s Moor',
description: 'The Pumpkin Sailor has returned to the shores of the living.',


+ 1
- 1
src/server/mods/event-halloween/spells/spellScatterPumpkinPieces.js View File

@@ -162,7 +162,7 @@ module.exports = {

particles.chance = 0.1;

let obj = this.obj.instance.objects.buildObjects([{
this.obj.instance.objects.buildObjects([{
sheetName: `${this.folderName}/images/mobs.png`,
cell: cell,
x: pos.x,


+ 25
- 0
src/server/objects/objBase.js View File

@@ -357,5 +357,30 @@ module.exports = {
}

this.components = null;
},

toString: function () {
let res = {};

for (let p in this) {
if (['components', 'syncer'].indexOf(p) > -1)
continue;

let val = this[p];
let stringVal = (val && val.toString) ? val.toString() : val;
const type = typeof(val);

if (
type !== 'function' &&
(
type !== 'object' ||
val.type
)
)
res[p] = stringVal;
}

return JSON.stringify(res, null, 4).split('"').join('') + '\r\n';
}
};

+ 1
- 1
src/server/security/connections.js View File

@@ -97,7 +97,7 @@ module.exports = {
keys.forEach(function (k) {
let val = player[k];
if (val && val.type) {
if (['player', 'auth', 'syncer'].indexOf(type) === -1)
if (['player', 'auth', 'syncer'].indexOf(val.type) === -1)
delete player[k];
}
});


+ 0
- 2
src/server/world/customMap.js View File

@@ -30,8 +30,6 @@ module.exports = {
},

build: function (callback) {
let map = this.instance.map.clientMap.map;

this.tiles.forEach(function (t) {
t = t.split('|');
this.customize(t[0], t[1], t[2], true);


+ 3
- 3
src/server/world/physics.js View File

@@ -2,7 +2,7 @@ let pathfinder = require('../misc/pathfinder');

let sqrt = Math.sqrt.bind(Math);
let ceil = Math.ceil.bind(Math);
let random = Math.random.bind(Math);
let mathRand = Math.random.bind(Math);

module.exports = {
graph: null,
@@ -277,8 +277,8 @@ module.exports = {

if (!to) {
to = {
x: ~~(random() * grid.length),
y: ~~(random() * grid[0].length)
x: ~~(mathRand() * grid.length),
y: ~~(mathRand() * grid[0].length)
};
}



Loading…
Cancel
Save