Second attempt to fix the sheath bug

SeaSparrowOG · Feb 11, 2024 · 2f6dda0 · 2f6dda0
1 parent ba666f5
commit 2f6dda0
Showing 1 changed file with 1 addition and 22 deletions.
diff --git a/src/actorEventManager.cpp b/src/actorEventManager.cpp
@@ -308,13 +308,6 @@ namespace ActorEvents {
 			auto* leftBound = leftEnchanted ? leftData->object : nullptr;
 			auto* leftWeapon = leftBound ? leftBound->As<RE::TESObjectWEAP>() : nullptr;
 
-			//No longer has enchantments.
-			if (!(leftWeapon || rightWeapon)) {
-				AnimationEventListener::GetSingleton()->UnRegisterActor(a_actor);
-				this->managedActors.erase(a_actor);
-				return;
-			}
-
 			//Unchanged data.
 			if (actorData->first.first == leftWeapon && actorData->first.second == rightWeapon) {
 				return;
@@ -371,12 +364,6 @@ namespace ActorEvents {
 		auto* leftBound = leftEnchanted ? leftData->object : nullptr;
 		auto* leftWeapon = leftBound ? leftBound->As<RE::TESObjectWEAP>() : nullptr;
 
-		if (!(leftWeapon || rightWeapon)) {
-			AnimationEventListener::GetSingleton()->UnRegisterActor(a_actor);
-			this->managedActors.erase(a_actor);
-			return;
-		}
-
 		AnimationEventListener::GetSingleton()->RegisterActor(a_actor);
 		this->managedActors[a_actor] = std::pair<std::pair<RE::TESObjectWEAP*, RE::TESObjectWEAP*>, bool>
 			(std::pair<RE::TESObjectWEAP*, RE::TESObjectWEAP*>(leftWeapon, rightWeapon),
@@ -400,20 +387,12 @@ namespace ActorEvents {
 		bool leftEnchanted = leftData ? leftData->IsEnchanted() : false;
 		auto* leftBound = leftEnchanted ? leftData->object : nullptr;
 		auto* leftWeapon = leftBound ? leftBound->As<RE::TESObjectWEAP>() : nullptr;
-
-		if (!(leftWeapon || rightWeapon)) {
-			//Super unecessary. This should never happen.
-			if (this->managedActors.contains(a_actor)) {
-				AnimationEventListener::GetSingleton()->UnRegisterActor(a_actor);
-				this->managedActors.erase(a_actor);
-			}
-			return;
-		}
 
 		this->managedActors[a_actor] = this->managedActors[a_actor] = std::pair<std::pair<RE::TESObjectWEAP*, RE::TESObjectWEAP*>, bool>
 			(std::pair<RE::TESObjectWEAP*, RE::TESObjectWEAP*>(leftWeapon, rightWeapon),
 				a_actor->IsWeaponDrawn());
 		AnimationEventListener::GetSingleton()->RegisterActor(a_actor);
+
 		if (leftWeapon || rightWeapon)
 			EvaluateActor(a_actor, leftWeapon, rightWeapon, a_actor->IsWeaponDrawn());
 	}