Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-11-14 22:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into grim-lu

Browse Source
This commit is contained in:
wincent
2023-10-07 14:22:23 +02:00
parent 5973430720 b33e9935f5
commit 2097dbfff1
407 changed files with 6059 additions and 3708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dGame/dInventory/Item.cpp
View File

@@ -102,7 +102,7 @@ Item::Item(
Game::logger->Log("Item", "Move and equipped (%i) from (%i)", this->lot, this->inventory->GetType());
EntityManager::Instance()->SerializeEntity(inventory->GetComponent()->GetParent());
Game::entityManager->SerializeEntity(inventory->GetComponent()->GetParent());
}
if (parent != LWOOBJID_EMPTY) return;

4
dGame/dInventory/ItemSetPassiveAbility.cpp
View File

@@ -44,7 +44,7 @@ void ItemSetPassiveAbility::Activate(Entity* target) {
return;
}
EntityManager::Instance()->SerializeEntity(m_Parent);
Game::entityManager->SerializeEntity(m_Parent);
const auto id = static_cast<eItemSetPassiveAbilityID>(m_ItemSet->GetID());
const auto parentID = m_Parent->GetObjectID();
@@ -203,7 +203,7 @@ void ItemSetPassiveAbility::OnEnemySmshed(Entity* target) {
return;
}
EntityManager::Instance()->SerializeEntity(m_Parent);
Game::entityManager->SerializeEntity(m_Parent);
const auto id = static_cast<eItemSetPassiveAbilityID>(m_ItemSet->GetID());
const auto parentID = m_Parent->GetObjectID();