From 50b6c7940e8325718daa45b01a6de3b8925e3061 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 3 Mar 2011 13:12:49 +0000
Subject: [PATCH] Fixes
git-svn-id: http://svn.net-core.org/repos/t-engine4@2907 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/UserChat.lua | 1 +
game/modules/tome/class/generator/actor/Arena.lua | 2 +-
game/modules/tome/data/calendar_dwarf.lua | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/game/engines/default/engine/UserChat.lua b/game/engines/default/engine/UserChat.lua
index f019a51b9d..f8cac16d67 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 7e89a79f8d..bc8db3401e 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 b7591b0dec..561b9f2087 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", },
--
GitLab