Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
This commit is contained in:
Applevangelist 2023-05-25 09:00:33 +02:00
commit dd496d35a8

View File

@ -691,7 +691,6 @@ function CONTROLLABLE:CommandActivateACLS( UnitID, Name, Delay )
SCHEDULER:New( nil, self.CommandActivateACLS, { self, UnitID, Name }, Delay ) SCHEDULER:New( nil, self.CommandActivateACLS, { self, UnitID, Name }, Delay )
else else
local controller = self:_GetController() local controller = self:_GetController()
self:I({controller})
controller:setCommand( CommandActivateACLS ) controller:setCommand( CommandActivateACLS )
end end