weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-07-27 08:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Client Message Bugs

Browse Source
This commit is contained in:
svenvandevelde
2015-11-01 16:20:55 +01:00
parent 0b04561a33
commit 0894d4ee40
5 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Client.lua
+7 -5
View File
@@ -68,10 +68,12 @@ end
-- @treturn Group
function CLIENT:ClientGroup()
--trace.f(self.ClassName)
local ReturnGroup = Group.getByName( self.ClientName )
if ReturnGroup and ReturnGroup:isExist() then
return ReturnGroup
local ClientData = Group.getByName( self.ClientName )
if ClientData and ClientData:isExist() then
trace.i( self.ClassName, self.ClientName .. " : group found!" )
return ClientData
else
-- trace.x( self.ClassName, self.ClientName .. " : no group found!" )
return nil
end
end
@@ -218,14 +220,14 @@ trace.f( self.ClassName, { Message, MessageDuration, MessageId, MessageCategory,
self.Messages[MessageId].MessageTime = timer.getTime()
self.Messages[MessageId].MessageDuration = MessageDuration
if MessageInterval == nil then
self.Messages[MessageId].MessageInterval = 300
self.Messages[MessageId].MessageInterval = 600
else
self.Messages[MessageId].MessageInterval = MessageInterval
end
MESSAGE:New( Message, MessageCategory, MessageDuration, MessageId ):ToClient( self )
else
if self:ClientGroup() and self:ClientGroup():getUnits() and self:ClientGroup():getUnits()[1] and not self:ClientGroup():getUnits()[1]:inAir() then
if timer.getTime() - self.Messages[MessageId].MessageTime >= self.Messages[MessageId].MessageDuration - 1 then
if timer.getTime() - self.Messages[MessageId].MessageTime >= self.Messages[MessageId].MessageDuration + 10 then
MESSAGE:New( Message, MessageCategory, MessageDuration, MessageId ):ToClient( self )
self.Messages[MessageId].MessageTime = timer.getTime()
end