From 33de630fa1116b52fb74e630054c4f070452a90e Mon Sep 17 00:00:00 2001 From: Shaun Date: Fri, 23 Feb 2024 17:52:02 +0200 Subject: [PATCH] bug #2018: Mobs can now have names that differ from their zone names --- src/server/world/map.js | 2 +- src/server/world/spawners.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/world/map.js b/src/server/world/map.js index 604cca5b..cb8a191c 100644 --- a/src/server/world/map.js +++ b/src/server/world/map.js @@ -471,7 +471,7 @@ module.exports = { if (this.zoneConfig?.objects?.[objZoneName.toLowerCase()]) extend(blueprint, this.zoneConfig.objects[objZoneName.toLowerCase()]); else if (this.zoneConfig?.mobs?.[objZoneName.toLowerCase()]) - extend(blueprint, this.zoneConfig.objects[objZoneName.toLowerCase()]); + extend(blueprint, this.zoneConfig.mobs[objZoneName.toLowerCase()]); if (blueprint.blocking) this.collisionMap[blueprint.x][blueprint.y] = 1; diff --git a/src/server/world/spawners.js b/src/server/world/spawners.js index a9c27d05..4020e43c 100644 --- a/src/server/world/spawners.js +++ b/src/server/world/spawners.js @@ -37,7 +37,7 @@ module.exports = { else this.mobTypes[name]++; - spawner.zonePrint = extend({}, this.zoneConfig.mobs.default, this.zoneConfig.mobs[name] || {}); + spawner.zonePrint = extend({}, this.zoneConfig.mobs.default, this.zoneConfig.mobs[(blueprint.objZoneName ?? blueprint.name).toLowerCase()] || {}); }, spawn: function (spawner) {