From b6fc959433d03849ef96b071a77cc7248e62b97a Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Tue, 28 Feb 2023 15:30:28 -0800
Subject: [PATCH] Fix shark stinky fish death animation (#1004)

---
 dScripts/02_server/Objects/StinkyFishTarget.cpp | 4 +++-
 dScripts/02_server/Objects/StinkyFishTarget.h   | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dScripts/02_server/Objects/StinkyFishTarget.cpp b/dScripts/02_server/Objects/StinkyFishTarget.cpp
index 21d92fac..459e0bbe 100644
--- a/dScripts/02_server/Objects/StinkyFishTarget.cpp
+++ b/dScripts/02_server/Objects/StinkyFishTarget.cpp
@@ -1,6 +1,7 @@
 #include "StinkyFishTarget.h"
 #include "EntityManager.h"
 #include "EntityInfo.h"
+#include "Entity.h"
 
 void StinkyFishTarget::OnStartup(Entity* self) {
 	auto position = self->GetPosition();
@@ -16,6 +17,7 @@ void StinkyFishTarget::OnSkillEventFired(Entity* self, Entity* caster, const std
 	self->SetVar<LWOOBJID>(u"player", caster->GetObjectID());
 
 	EntityInfo entityInfo{};
+	entityInfo.lot = SHARK_LOT;
 	entityInfo.pos = self->GetPosition();
 	entityInfo.rot = self->GetRotation();
 	entityInfo.spawnerID = self->GetObjectID();
@@ -35,7 +37,7 @@ void StinkyFishTarget::OnTimerDone(Entity* self, std::string timerName) {
 		const auto playerID = self->GetVar<LWOOBJID>(u"player");
 		auto* fish = EntityManager::Instance()->GetEntity(self->GetVar<LWOOBJID>(u"fish"));
 
-		if (fish != nullptr) {
+		if (fish) {
 			fish->Smash(playerID);
 			self->Smash(playerID);
 		}
diff --git a/dScripts/02_server/Objects/StinkyFishTarget.h b/dScripts/02_server/Objects/StinkyFishTarget.h
index 6c52171d..b8f9e9ae 100644
--- a/dScripts/02_server/Objects/StinkyFishTarget.h
+++ b/dScripts/02_server/Objects/StinkyFishTarget.h
@@ -2,7 +2,10 @@
 #include "CppScripts.h"
 
 class StinkyFishTarget : public CppScripts::Script {
+public:
 	void OnStartup(Entity* self) override;
 	void OnSkillEventFired(Entity* self, Entity* caster, const std::string& message) override;
 	void OnTimerDone(Entity* self, std::string timerName) override;
+private:
+	const LOT SHARK_LOT = 8570;
 };