Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-10 01:18:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into components-wheeeee

Browse Source
This commit is contained in:
Aaron Kimbre
2023-06-23 10:36:21 -05:00
parent f27e0400e7 41898bef86
commit bcbc5882dc
12 changed files with 114 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dGame/dUtilities/VanityUtilities.cpp
View File

@@ -119,7 +119,7 @@ void VanityUtilities::SpawnVanity() {
auto* scriptComponent = npcEntity->GetComponent<ScriptComponent>();
if (scriptComponent != nullptr) {
if (scriptComponent && !npc.m_Script.empty()) {
scriptComponent->SetScript(npc.m_Script);
for (const auto& npc : npc.m_Flags) {
@@ -162,7 +162,7 @@ Entity* VanityUtilities::SpawnNPC(LOT lot, const std::string& name, const NiPoin
auto* inventoryComponent = entity->GetComponent<InventoryComponent>();
if (inventoryComponent != nullptr) {
if (inventoryComponent && !inventory.empty()) {
inventoryComponent->SetNPCItems(inventory);
}