diff --git a/DASHelper.lua b/DASHelper.lua index 32d2f4b..ff3408e 100644 --- a/DASHelper.lua +++ b/DASHelper.lua @@ -93,7 +93,7 @@ function DAS.FindInList(array, item) end function DAS.TryTriggerAutoAcceptInvite() - if DAS.GetAutoAcceptInviteInterval() then + if DAS.GetAutoAcceptInviteInterval() > 0 then DAS.SetAutoAcceptInvite(true) zo_callLater(DAS.SetAutoAcceptInvite, DAS.GetAutoAcceptInviteInterval()*1000) end diff --git a/DailyAutoShare.txt b/DailyAutoShare.txt index 1a07ba1..a16946d 100644 --- a/DailyAutoShare.txt +++ b/DailyAutoShare.txt @@ -1,6 +1,6 @@ ## Title: DailyAutoShare ## Author: manavortex -## Version: 3.1.2 +## Version: 3.1.3 ## APIVersion: 100022 ## SavedVariables: DAS_Settings DAS_Globals ## OptionalDependsOn: LibStub LibCustomMenu LibAddonMenu-2.0 LibMediaProvider-1.0 pchat diff --git a/DasChatMessage.lua b/DasChatMessage.lua index 1d732df..3423895 100644 --- a/DasChatMessage.lua +++ b/DasChatMessage.lua @@ -72,7 +72,7 @@ function DAS.OnChatMessage(eventCode, channelType, fromName, messageText, _, fro local isPlayerName = fromDisplayName:find(DAS.pdn) -- if we aren't listening, or if we are listening and the message's from us, ignore it - if not channelTypes[channelType] or (channelTypes[channelType] and isPlayerName) then return end + if not (channelTypes[channelType] or isPlayerName) then return end -- if it's a group message, react to the group message if (channelType == CHAT_CHANNEL_PARTY) and (messageText:find(stringShare) or messageText:find(stringQuest)) then @@ -89,7 +89,7 @@ function DAS.OnChatMessage(eventCode, channelType, fromName, messageText, _, fro local groupStatus = IsUnitGrouped(unittagplayer) if groupStatus and DAS.GetGroupLeaveOnNewSearch() then GroupLeave() - elseif groupStatus then + else DAS.TryTriggerAutoAcceptInvite() end return diff --git a/questData/Wrothgar.lua b/questData/Wrothgar.lua index 08b37a4..07a2478 100644 --- a/questData/Wrothgar.lua +++ b/questData/Wrothgar.lua @@ -33,7 +33,7 @@ table.insert(tbl2, {[1] = "ogre", [2] = "mad", [3] = "shrek"}) table.insert(tbl2, "harpy") table.insert(tbl2, "spirits") table.insert(tbl2, "durzog") -table.insert(tbl2, "dwemer") +table.insert(tbl2, {[1] ="dwemer", [2] = "parts"}) table.insert(tbl2, {[1] = "wolf", [2] = "skintrade"}) table.insert(tbl2, {[1] = "bandit", [2] = "fire"}) diff --git a/startup.lua b/startup.lua index 2bd1622..d1c08ff 100644 --- a/startup.lua +++ b/startup.lua @@ -3,7 +3,7 @@ DAS = DailyAutoShare local DailyAutoShare = DailyAutoShare DAS.name = "Daily Autoshare" -DAS.version = "3.1.2" +DAS.version = "3.1.3" DAS.author = "manavortex" DAS.settings = {} DAS.globalSettings = {} @@ -327,7 +327,7 @@ local function OnQuestRemoved(eventCode, isCompleted, journalIndex, questName, z zo_callLater(function() DAS.SetAutoInvite(autoInvite) DAS.RefreshControl(true) - end, 1000) + end, 3000) end local function deleteYesterdaysLog()