From 286a2bdf16c0744fdd3eb49999fd0703b4dbc927 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Fri, 6 Dec 2024 13:05:34 -0800 Subject: [PATCH 1/2] yep --- dGame/Entity.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dGame/Entity.cpp b/dGame/Entity.cpp index 54629888..55b3b3b5 100644 --- a/dGame/Entity.cpp +++ b/dGame/Entity.cpp @@ -1351,6 +1351,11 @@ void Entity::OnCollisionPhantom(const LWOOBJID otherEntity) { callback(other); } + SwitchComponent* switchComp = GetComponent(); + if (switchComp) { + switchComp->OnUse(other); + } + TriggerEvent(eTriggerEventType::ENTER, other); // POI system From 9d4dea05c287b505b8392eb839c258f60af7247a Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Fri, 6 Dec 2024 15:57:40 -0800 Subject: [PATCH 2/2] remove dumb knockback idk how the 1 switch in pet cove does it --- dGame/dComponents/SwitchComponent.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/dGame/dComponents/SwitchComponent.cpp b/dGame/dComponents/SwitchComponent.cpp index cb13cc7f..4f48fb46 100644 --- a/dGame/dComponents/SwitchComponent.cpp +++ b/dGame/dComponents/SwitchComponent.cpp @@ -82,7 +82,6 @@ void SwitchComponent::EntityEnter(Entity* entity) { RenderComponent::PlayAnimation(m_Parent, u"engaged"); m_PetBouncer->SetPetBouncerEnabled(true); } else { - GameMessages::SendKnockback(entity->GetObjectID(), m_Parent->GetObjectID(), m_Parent->GetObjectID(), 0.0f, NiPoint3(0.0f, 17.0f, 0.0f)); Game::entityManager->SerializeEntity(m_Parent); }