FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
#	Moose Setup/Moose.files
This commit is contained in:
Applevangelist 2024-08-16 09:41:25 +02:00
commit 9bb18a9df2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Core/Event.lua
View File

@ -1482,7 +1482,7 @@ function EVENT:onEvent( Event )
end end
-- Weapon. -- Weapon.
if Event.weapon and type(Event.weapon) == "table" then if Event.weapon and type(Event.weapon) == "table" and Event.weapon.isExist and Event.weapon:isExist() then
Event.Weapon = Event.weapon Event.Weapon = Event.weapon
Event.WeaponName = Event.weapon:isExist() and Event.weapon:getTypeName() or "Unknown Weapon" Event.WeaponName = Event.weapon:isExist() and Event.weapon:getTypeName() or "Unknown Weapon"
Event.WeaponUNIT = CLIENT:Find( Event.Weapon, '', true ) -- Sometimes, the weapon is a player unit! Event.WeaponUNIT = CLIENT:Find( Event.Weapon, '', true ) -- Sometimes, the weapon is a player unit!

2
Moose Development/Moose/Wrapper/Net.lua
View File

@ -528,6 +528,7 @@ function NET:SendChatToPlayer(Message, ToPlayer, FromPlayer)
return self return self
end end
--[[ not in 2.97 MSE any longer
--- Load a specific mission. --- Load a specific mission.
-- @param #NET self -- @param #NET self
-- @param #string Path and Mission -- @param #string Path and Mission
@ -550,6 +551,7 @@ function NET:LoadNextMission()
outcome = net.load_next_mission() outcome = net.load_next_mission()
return outcome return outcome
end end
--]]
--- Return a table of players currently connected to the server. --- Return a table of players currently connected to the server.
-- @param #NET self -- @param #NET self