fix: orient player correctly when using pirate mast in FV (#1087)

* fix: frient player correctly when using pirate mast in FV * only get mast name once
DarkflameUniverse · May 13, 2023 · 1af7016 · 1af7016
1 parent 739eae5
commit 1af7016
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/dScripts/02_server/Map/GF/MastTeleport.cpp b/dScripts/02_server/Map/GF/MastTeleport.cpp
@@ -43,10 +43,13 @@ void MastTeleport::OnTimerDone(Entity* self, std::string timerName) {
 		GameMessages::SendTeleport(playerId, position, rotation, player->GetSystemAddress(), true);
 
 		// Hacky fix for odd rotations
-		if (self->GetVar<std::u16string>(u"MastName") != u"Jail") {
+		auto mastName = self->GetVar<std::u16string>(u"MastName");
+		if (mastName == u"Elephant") {
 			GameMessages::SendOrientToAngle(playerId, true, (M_PI / 180) * 140.0f, player->GetSystemAddress());
-		} else {
+		} else if (mastName == u"Jail") {
 			GameMessages::SendOrientToAngle(playerId, true, (M_PI / 180) * 100.0f, player->GetSystemAddress());
+		} else if (mastName == u""){
+			GameMessages::SendOrientToAngle(playerId, true, (M_PI / 180) * 203.0f, player->GetSystemAddress());
 		}
 
 		const auto cinematic = GeneralUtils::UTF16ToWTF8(self->GetVar<std::u16string>(u"Cinematic"));