diff --git a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
index b5d707d5..5d2c3eff 100644
--- a/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
+++ b/EndlessVendetta/.idea/.idea.EndlessVendetta/.idea/workspace.xml
@@ -9,11 +9,10 @@
-
-
-
-
-
+
+
+
+
@@ -130,6 +129,7 @@
1706900339638
+
diff --git a/EndlessVendetta/Content/Levels/TempOpenWorld.umap b/EndlessVendetta/Content/Levels/TempOpenWorld.umap
index 331dc700..b460c344 100644
--- a/EndlessVendetta/Content/Levels/TempOpenWorld.umap
+++ b/EndlessVendetta/Content/Levels/TempOpenWorld.umap
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3977a136e9c4c43dad14b8288902b6cf0cf3c7b46eac4dfdcb8cc25e225edc02
-size 13864728
+oid sha256:513e7a005246865fbaac9bf4abda7bf0473776603585a01eea1bd278711dbfce
+size 13864801
diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
index 56a9fbe5..5f51ceb6 100644
--- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
+++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:466c723985861da68aa9ea25153ae0068833dd6159178b0c033d0f814a8cd6f5
+oid sha256:54d78cbc2e7ef625432ee7b2da07e34a29fc46f230ab4ba5105f1efd2c9c7ca3
size 14831
diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
index f0412376..81ca8170 100644
--- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
@@ -734,8 +734,15 @@ void AEndlessVendettaCharacter::EnterShip(FTransform TakeoffLoc)
void AEndlessVendettaCharacter::ExitShip(FTransform ExitLoc)
{
PlayFadeScreen();
- SetActorLocation(ExitLoc.GetLocation());
+ APlayerController* PC = Cast(GetController());
+ PC->SetIgnoreMoveInput(true);
+ PC->SetIgnoreLookInput(true);
+ SpaceShip->GetCharacterMovement()->Velocity = FVector(0, 0, 0);
+ GetCharacterMovement()->Velocity = FVector(0, 0, 0);
+ SetActorLocation(ExitLoc.GetLocation(), false, nullptr, ETeleportType::ResetPhysics);
GetController()->SetControlRotation(ExitLoc.Rotator());
SpaceShip->Destroy();
PlayerOnShip = false;
+ PC->SetIgnoreMoveInput(false);
+ PC->SetIgnoreLookInput(false);
}