From 0cc4438abdcb98fae98fd36cac2d3f64528623eb Mon Sep 17 00:00:00 2001
From: altrisi <altrisi.trillosierra@gmail.com>
Date: Sun, 14 Dec 2025 22:26:55 +0100
Subject: [PATCH] Fix crash when leaving entity camera in spectator

Fixes #2140
---
 src/main/java/carpet/mixins/Player_scarpetEventsMixin.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/carpet/mixins/Player_scarpetEventsMixin.java b/src/main/java/carpet/mixins/Player_scarpetEventsMixin.java
index 0d181f5b..5454d21a 100644
--- a/src/main/java/carpet/mixins/Player_scarpetEventsMixin.java
+++ b/src/main/java/carpet/mixins/Player_scarpetEventsMixin.java
@@ -91,6 +91,10 @@ public abstract class Player_scarpetEventsMixin extends LivingEntity
     @ModifyReturnValue(method = "wantsToStopRiding", at = @At("TAIL"))
     private boolean dontUnmountFromIfPermanentVehicle(boolean original)
     {
+        if (this.getVehicle() == null) {
+            // may also be called when leaving entity camera in spectator
+            return original;
+        }
         return original && !((EntityInterface) this.getVehicle()).isPermanentVehicle();
     }
 }