From 9dc9b21b166b604ea8897f7bee3c8069ef153e43 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 5 Aug 2024 12:34:59 +0200 Subject: [PATCH 1/2] Update build-includes.yml (#2154) --- .github/workflows/build-includes.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-includes.yml b/.github/workflows/build-includes.yml index 1d7e6e969..54220b0df 100644 --- a/.github/workflows/build-includes.yml +++ b/.github/workflows/build-includes.yml @@ -5,6 +5,8 @@ on: branches: - master - develop + - Apple/Develop + paths: - 'Moose Setup/**/*.lua' - 'Moose Development/**/*.lua' From a3864d5f324f6b55c2d6066636edaebd8ab07995 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 8 Aug 2024 09:20:55 +0200 Subject: [PATCH 2/2] #EVENT small fixes --- Moose Development/Moose/Core/Event.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Core/Event.lua b/Moose Development/Moose/Core/Event.lua index 54813f39c..1d713607c 100644 --- a/Moose Development/Moose/Core/Event.lua +++ b/Moose Development/Moose/Core/Event.lua @@ -1388,9 +1388,9 @@ function EVENT:onEvent( Event ) Event.WeaponUNIT = CLIENT:Find( Event.Weapon, '', true ) -- Sometimes, the weapon is a player unit! Event.WeaponPlayerName = Event.WeaponUNIT and Event.Weapon.getPlayerName and Event.Weapon:getPlayerName() --Event.WeaponPlayerName = Event.WeaponUNIT and Event.Weapon:getPlayerName() - Event.WeaponCoalition = Event.WeaponUNIT and Event.Weapon:getCoalition() - Event.WeaponCategory = Event.WeaponUNIT and Event.Weapon:getDesc().category - Event.WeaponTypeName = Event.WeaponUNIT and Event.Weapon:getTypeName() + Event.WeaponCoalition = Event.WeaponUNIT and Event.Weapon.getCoalition and Event.Weapon:getCoalition() + Event.WeaponCategory = Event.WeaponUNIT and Event.Weapon.getDesc and Event.Weapon:getDesc().category + Event.WeaponTypeName = Event.WeaponUNIT and Event.Weapon.getTypeName and Event.Weapon:getTypeName() --Event.WeaponTgtDCSUnit = Event.Weapon:getTarget() end