diff --git a/game/engines/default/engine/UserChat.lua b/game/engines/default/engine/UserChat.lua index f019a51b9d1e9f792da1b1d94c8bbbfe703e2c59..f8cac16d67adc6c89665cbbd93a1b63815bb9f78 100644 --- a/game/engines/default/engine/UserChat.lua +++ b/game/engines/default/engine/UserChat.lua @@ -96,6 +96,7 @@ function _M:event(e) elseif e.se == "ChannelList" then local info = zlib.decompress(e.data):unserialize() if not info then return end + if not e.channel or not self.channels[e.channel] then return end self.channels[e.channel].users = {} for _, user in ipairs(info.users) do self.channels[e.channel].users[user.login] = { diff --git a/game/modules/tome/class/generator/actor/Arena.lua b/game/modules/tome/class/generator/actor/Arena.lua index 7e89a79f8de596e16feadda54b10e4ce56d7d9d0..bc8db3401e52f6ad4f4dbbf7fdebbffb662e0b40 100644 --- a/game/modules/tome/class/generator/actor/Arena.lua +++ b/game/modules/tome/class/generator/actor/Arena.lua @@ -340,7 +340,7 @@ function _M:calculateWave() special = function (self) if game.level.arena.currentWave > 35 then self.entity = { name = "high slinger" } end return self end }, { entity = { name = "dremling" }, wave = 1, power = 6, delay = 2, bonus = 0.3 , score = 100, entry = 2, - special = function (self) if game.level.arena.currentWave > 15 then self.wave = 2 end end }, + special = function (self) if game.level.arena.currentWave > 15 then self.wave = 2 end return self end }, { entity = { name = "brown bear" }, wave = 1, power = 4, delay = 3, bonus = 0.2, score = 100 , entry = 2}, { entity = { type = "animal", subtype = "snake" }, diff --git a/game/modules/tome/data/calendar_dwarf.lua b/game/modules/tome/data/calendar_dwarf.lua index b7591b0dec7f047ea25719b6df4baf71cbc09c55..561b9f20876b13514502210dcaef826cd6564380 100644 --- a/game/modules/tome/data/calendar_dwarf.lua +++ b/game/modules/tome/data/calendar_dwarf.lua @@ -23,7 +23,7 @@ return { { 30, "Gold", }, { 45, "Stralite", }, { 31, "Voratun", }, - { 3, "Acuisition", }, + { 3, "Acquisition", }, { 45, "Profit", }, { 30, "Wealth", }, { 45, "Dearth", },