diff --git a/Moose Development/Moose/Core/Event.lua b/Moose Development/Moose/Core/Event.lua index bd4cd039e..abfc87d22 100644 --- a/Moose Development/Moose/Core/Event.lua +++ b/Moose Development/Moose/Core/Event.lua @@ -1530,7 +1530,9 @@ function EVENT:onEvent( Event ) if Event.dynamiccargo then Event.IniDynamicCargo = Event.dynamiccargo Event.IniDynamicCargoName = Event.IniDynamicCargo.StaticName - Event.IniPlayerName = Event.IniDynamicCargo.Owner or string.match(Event.IniUnitName,"^(.+)|%d%d:%d%d|PKG%d+") + if Event.IniDynamicCargo.Owner or Event.IniUnitName then + Event.IniPlayerName = Event.IniDynamicCargo.Owner or string.match(Event.IniUnitName or "None|00:00|PKG00","^(.+)|%d%d:%d%d|PKG%d+") + end end -- Zone object. diff --git a/Moose Development/Moose/Wrapper/Positionable.lua b/Moose Development/Moose/Wrapper/Positionable.lua index fb552427d..9d8c77873 100644 --- a/Moose Development/Moose/Wrapper/Positionable.lua +++ b/Moose Development/Moose/Wrapper/Positionable.lua @@ -1853,6 +1853,7 @@ do -- Cargo ["HL_KORD"] = 6*POSITIONABLE.DefaultInfantryWeight, ["HL_DSHK"] = 6*POSITIONABLE.DefaultInfantryWeight, ["CCKW_353"] = 16*POSITIONABLE.DefaultInfantryWeight, --GMC CCKW 2½-ton 6×6 truck, estimating 16 soldiers, + ["MaxxPro_MRAP"] = 7*POSITIONABLE.DefaultInfantryWeight, } }