diff --git a/Plugins/Public/bountyscan/Main.cpp b/Plugins/Public/bountyscan/Main.cpp index 09398fcb9..388ea548b 100644 --- a/Plugins/Public/bountyscan/Main.cpp +++ b/Plugins/Public/bountyscan/Main.cpp @@ -126,7 +126,8 @@ struct USERCMD USERCMD UserCmds[] = { - { L"/bountyscan", UserCmd_BountyScan, L"Usage: /bountyscan" }, + { L"/bountyscan", UserCmd_BountyScan, L"Usage: /bountyscan or /bs" }, + { L"/bs", UserCmd_BountyScan, L"Usage: /bountyscan or /bs" }, }; bool UserCmd_Process(uint iClientID, const wstring &wscCmd) diff --git a/Plugins/Public/mobiledocking_plugin/Main.cpp b/Plugins/Public/mobiledocking_plugin/Main.cpp index 15b6e4f49..032c969f5 100644 --- a/Plugins/Public/mobiledocking_plugin/Main.cpp +++ b/Plugins/Public/mobiledocking_plugin/Main.cpp @@ -356,7 +356,6 @@ JettisonResult RemoveShipFromLists(const wstring& dockedShipName, bool forcedLau PrintUserCmdText(dockedClientID, L"You've been forcefully jettisoned by the carrier."); PrintUserCmdText(dockedClientID, L"Current home base: %ls", newBaseInfo.c_str()); } - Players[dockedClientID].iLastBaseID = idToDockedInfoMap[dockedClientID]->lastDockedSolar; idToDockedInfoMap.erase(dockedClientID); wstring& carrierName = nameToDockedInfoMap[dockedShipName].carrierName; @@ -737,7 +736,14 @@ void __stdcall PlayerLaunch_AFTER(unsigned int ship, unsigned int client) if (jettisonedShipsQueue.count(client)) { - HkBeamById(client, jettisonedShipsQueue.at(client)); + CUSTOM_BASE_BEAM_STRUCT info; + info.iClientID = client; + info.iTargetBaseID = jettisonedShipsQueue.at(client); + Plugin_Communication(CUSTOM_BASE_BEAM, &info); + if (!info.bBeamed) + { + HkBeamById(client, jettisonedShipsQueue.at(client)); + } jettisonedShipsQueue.erase(client); return; } @@ -1221,7 +1227,7 @@ void Plugin_Communication_CallBack(PLUGIN_MESSAGE msg, void* data) if (msg == CUSTOM_MOBILE_DOCK_CHECK) { CUSTOM_MOBILE_DOCK_CHECK_STRUCT* mobileDockCheck = reinterpret_cast(data); - if (idToDockedInfoMap.count(mobileDockCheck->iClientID)) + if (idToDockedInfoMap.count(mobileDockCheck->iClientID) || jettisonedShipsQueue.count(mobileDockCheck->iClientID)) { mobileDockCheck->isMobileDocked = true; } diff --git a/Plugins/Public/munitioncntl/Main.cpp b/Plugins/Public/munitioncntl/Main.cpp index f47cced24..c92146a4d 100644 --- a/Plugins/Public/munitioncntl/Main.cpp +++ b/Plugins/Public/munitioncntl/Main.cpp @@ -171,7 +171,8 @@ void ProcessGuided(FLPACKET_CREATEGUIDED& createGuidedPacket) { case NOTRACK_NOALERT: { - const auto& projectile = reinterpret_cast(CObject::Find(createGuidedPacket.iProjectileId, CObject::CGUIDED_OBJECT)); + CGuided* projectile = reinterpret_cast(CObject::Find(createGuidedPacket.iProjectileId, CObject::CGUIDED_OBJECT)); + projectile->Release(); projectile->set_target(nullptr); //disable tracking, switch fallthrough to also disable alert } case TRACK_NOALERT: