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

misc

Browse Source
This commit is contained in:
jadebenn 2024-12-16 20:36:03 -06:00
parent d42351d1f3
commit 79c26d9330
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dGame/dComponents/PetComponent.cpp
View File

@ -151,6 +151,14 @@ void PetComponent::OnUse(Entity* originator) {
case ePetAbilityType::JumpOnObject: // Bouncer case ePetAbilityType::JumpOnObject: // Bouncer
StartInteractBouncer(); StartInteractBouncer();
break; break;
default:
LOG_DEBUG(
"Unhandled pet interaction - Owner: %ld, ePetAbilityType %d",
m_Owner,
GeneralUtils::ToUnderlying(m_Interaction.ability)
);
break;
} }
} else { } else {
StartTamingMinigame(originator); StartTamingMinigame(originator);
@ -323,7 +331,7 @@ void PetComponent::StartTamingMinigame(Entity* originator) {
// Notify the start of a pet taming minigame // Notify the start of a pet taming minigame
m_Parent->GetScript()->OnNotifyPetTamingMinigame(m_Parent, originator, ePetTamingNotifyType::BEGIN); m_Parent->GetScript()->OnNotifyPetTamingMinigame(m_Parent, originator, ePetTamingNotifyType::BEGIN);
auto* characterComponent = originator->GetComponent<CharacterComponent>(); auto* const characterComponent = originator->GetComponent<CharacterComponent>();
if (characterComponent != nullptr) { if (characterComponent != nullptr) {
characterComponent->SetCurrentActivity(eGameActivity::PET_TAMING); characterComponent->SetCurrentActivity(eGameActivity::PET_TAMING);
Game::entityManager->SerializeEntity(originator); Game::entityManager->SerializeEntity(originator);

2
dGame/dGameMessages/GameMessageHandler.cpp
View File

@ -110,7 +110,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream& inStream, const System
if (var) { if (var) {
entity->SetVar<bool>(u"dlu_first_time_load", false); entity->SetVar<bool>(u"dlu_first_time_load", false);
InventoryComponent* inventoryComponent = entity->GetComponent<InventoryComponent>(); InventoryComponent* inventoryComponent = entity->GetComponent<InventoryComponent>();
if (inventoryComponent) inventoryComponent->FixInvisibleItems(); if (inventoryComponent) inventoryComponent->FixInvisibleItems();
} }
break; break;