from retail
This commit is contained in:
@@ -149,6 +149,9 @@ local blockedFunctions = {
|
|||||||
securecall = true,
|
securecall = true,
|
||||||
DeleteCursorItem = true,
|
DeleteCursorItem = true,
|
||||||
ChatEdit_SendText = true,
|
ChatEdit_SendText = true,
|
||||||
|
ChatEdit_ActivateChat = true,
|
||||||
|
ChatEdit_ParseText = true,
|
||||||
|
ChatEdit_OnEnterPressed = true,
|
||||||
}
|
}
|
||||||
|
|
||||||
local blockedTables = {
|
local blockedTables = {
|
||||||
@@ -156,6 +159,7 @@ local blockedTables = {
|
|||||||
SendMailMailButton = true,
|
SendMailMailButton = true,
|
||||||
SendMailMoneyGold = true,
|
SendMailMoneyGold = true,
|
||||||
MailFrameTab2 = true,
|
MailFrameTab2 = true,
|
||||||
|
DEFAULT_CHAT_FRAME = true,
|
||||||
ChatFrame1 = true,
|
ChatFrame1 = true,
|
||||||
--WeakAurasSaved = true,
|
--WeakAurasSaved = true,
|
||||||
WeakAurasOptions = true,
|
WeakAurasOptions = true,
|
||||||
|
|||||||
@@ -1791,8 +1791,11 @@ local function EventHandler(frame, event, arg1, arg2, ...)
|
|||||||
elseif event == "PARTY_MEMBERS_CHANGED" or event == "RAID_ROSTER_UPDATE" then
|
elseif event == "PARTY_MEMBERS_CHANGED" or event == "RAID_ROSTER_UPDATE" then
|
||||||
for unit in GetAllUnits("group", true, "PlayersAndPets") do
|
for unit in GetAllUnits("group", true, "PlayersAndPets") do
|
||||||
RecheckActiveForUnitType("group", unit, deactivatedTriggerInfos)
|
RecheckActiveForUnitType("group", unit, deactivatedTriggerInfos)
|
||||||
if not UnitExistsFixed(unit) then
|
local exists = UnitExistsFixed(unit)
|
||||||
|
if not exists then
|
||||||
tinsert(unitsToRemove, unit)
|
tinsert(unitsToRemove, unit)
|
||||||
|
elseif exists ~= existingUnits[unit] then
|
||||||
|
ScanGroupUnit(time, matchDataChanged, "group", unit)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
elseif event == "UNIT_FLAGS" or event == "UNIT_NAME_UPDATE" or event == "PLAYER_FLAGS_CHANGED" then
|
elseif event == "UNIT_FLAGS" or event == "UNIT_NAME_UPDATE" or event == "PLAYER_FLAGS_CHANGED" then
|
||||||
|
|||||||
@@ -3069,7 +3069,7 @@ do
|
|||||||
|
|
||||||
local function dbmEventCallback(event, ...)
|
local function dbmEventCallback(event, ...)
|
||||||
if event == "DBM_TimerStart" then
|
if event == "DBM_TimerStart" then
|
||||||
local id, msg, duration, icon, timerType, spellId, dbmType = ...
|
local id, msg, duration, icon, timerType, spellId, dbmType, _, _, _, _, _, timerCount = ...
|
||||||
local now = GetTime()
|
local now = GetTime()
|
||||||
local expirationTime = now + duration
|
local expirationTime = now + duration
|
||||||
bars[id] = bars[id] or {}
|
bars[id] = bars[id] or {}
|
||||||
@@ -3080,7 +3080,7 @@ do
|
|||||||
bar.icon = icon
|
bar.icon = icon
|
||||||
bar.timerType = timerType
|
bar.timerType = timerType
|
||||||
bar.spellId = tostring(spellId)
|
bar.spellId = tostring(spellId)
|
||||||
bar.count = msg:match("%((%d+)%)") or msg:match("((%d+))") or "0"
|
bar.count = timerCount and tostring(timerCount) or "0"
|
||||||
bar.dbmType = dbmType
|
bar.dbmType = dbmType
|
||||||
|
|
||||||
local barOptions = DBM.ReleaseRevision >= 20220412000000 and DBT.Options or DBM.Bars.options
|
local barOptions = DBM.ReleaseRevision >= 20220412000000 and DBT.Options or DBM.Bars.options
|
||||||
|
|||||||
@@ -7010,17 +7010,10 @@ Private.event_prototypes = {
|
|||||||
tinsert(events, "RAID_ROSTER_UPDATE")
|
tinsert(events, "RAID_ROSTER_UPDATE")
|
||||||
end
|
end
|
||||||
|
|
||||||
if trigger.use_instance_size ~= nil then
|
if trigger.use_instance_difficulty ~= nil
|
||||||
tinsert(events, "ZONE_CHANGED")
|
or trigger.use_instance_size ~= nil
|
||||||
tinsert(events, "ZONE_CHANGED_INDOORS")
|
then
|
||||||
tinsert(events, "ZONE_CHANGED_NEW_AREA")
|
|
||||||
end
|
|
||||||
|
|
||||||
if trigger.use_instance_difficulty ~= nil then
|
|
||||||
tinsert(events, "PLAYER_DIFFICULTY_CHANGED")
|
tinsert(events, "PLAYER_DIFFICULTY_CHANGED")
|
||||||
tinsert(events, "ZONE_CHANGED")
|
|
||||||
tinsert(events, "ZONE_CHANGED_INDOORS")
|
|
||||||
tinsert(events, "ZONE_CHANGED_NEW_AREA")
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -7038,6 +7031,12 @@ Private.event_prototypes = {
|
|||||||
tinsert(events, "PLAYER_MOVE_SPEED_UPDATE");
|
tinsert(events, "PLAYER_MOVE_SPEED_UPDATE");
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if trigger.use_instance_difficulty ~= nil
|
||||||
|
or trigger.use_instance_size ~= nil
|
||||||
|
then
|
||||||
|
tinsert(events, "WA_DELAYED_PLAYER_ENTERING_WORLD")
|
||||||
|
end
|
||||||
|
|
||||||
if (trigger.use_HasPet ~= nil) then
|
if (trigger.use_HasPet ~= nil) then
|
||||||
AddUnitChangeInternalEvents("pet", events);
|
AddUnitChangeInternalEvents("pet", events);
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1343,12 +1343,21 @@ local function modify(parent, region, data)
|
|||||||
|
|
||||||
local controlPoint = regionData.controlPoint
|
local controlPoint = regionData.controlPoint
|
||||||
controlPoint:ClearAnchorPoint()
|
controlPoint:ClearAnchorPoint()
|
||||||
controlPoint:SetAnchorPoint(
|
if frame == "" then
|
||||||
data.selfPoint,
|
controlPoint:SetAnchorPoint(
|
||||||
frame == "" and self.relativeTo or frame,
|
data.selfPoint,
|
||||||
data.anchorPoint,
|
self,
|
||||||
x + data.xOffset, y + data.yOffset
|
data.selfPoint,
|
||||||
)
|
x, y
|
||||||
|
)
|
||||||
|
else
|
||||||
|
controlPoint:SetAnchorPoint(
|
||||||
|
data.selfPoint,
|
||||||
|
frame,
|
||||||
|
data.anchorPoint,
|
||||||
|
x + data.xOffset, y + data.yOffset
|
||||||
|
)
|
||||||
|
end
|
||||||
if show and frame ~= WeakAuras.HiddenFrames then
|
if show and frame ~= WeakAuras.HiddenFrames then
|
||||||
controlPoint:Show()
|
controlPoint:Show()
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -94,6 +94,7 @@ local function modify(parent, region, data)
|
|||||||
--region.texture:SetRotation((data.rotation / 180) * math.pi);
|
--region.texture:SetRotation((data.rotation / 180) * math.pi);
|
||||||
|
|
||||||
local function GetRotatedPoints(degrees)
|
local function GetRotatedPoints(degrees)
|
||||||
|
degrees = degrees or 0
|
||||||
local angle = rad(135 - degrees);
|
local angle = rad(135 - degrees);
|
||||||
local vx = math.cos(angle);
|
local vx = math.cos(angle);
|
||||||
local vy = math.sin(angle);
|
local vy = math.sin(angle);
|
||||||
|
|||||||
@@ -3046,6 +3046,8 @@ function Private.HandleChatAction(message_type, message, message_dest, message_d
|
|||||||
message_dest = Private.ReplacePlaceHolders(message_dest, region, customFunc, useHiddenStates, formatters);
|
message_dest = Private.ReplacePlaceHolders(message_dest, region, customFunc, useHiddenStates, formatters);
|
||||||
end
|
end
|
||||||
if message_dest_isunit == true then
|
if message_dest_isunit == true then
|
||||||
|
-- send to server like retail doesnt work here
|
||||||
|
-- message_dest = GetUnitName(message_dest, true)
|
||||||
message_dest = UnitName(message_dest)
|
message_dest = UnitName(message_dest)
|
||||||
end
|
end
|
||||||
pcall(function() SendChatMessage(message, "WHISPER", nil, message_dest) end);
|
pcall(function() SendChatMessage(message, "WHISPER", nil, message_dest) end);
|
||||||
|
|||||||
Reference in New Issue
Block a user