Add null check to clicking coupled stock

TeamOpenIndustry · Oct 6, 2023 · b3781fc · b3781fc
1 parent f9b32e8
commit b3781fc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/cam72cam/immersiverailroading/entity/EntityCoupleableRollingStock.java b/src/main/java/cam72cam/immersiverailroading/entity/EntityCoupleableRollingStock.java
@@ -114,8 +114,8 @@ public ClickResult onClick(Player player, Player.Hand hand) {
 					player.sendMessage(ChatText.COUPLER_DISENGAGED.getMessage(coupler));
 				}
 			} else {
-				if (this.isCoupled(coupler) && this.isCouplerEngaged(coupler)) {
-					EntityCoupleableRollingStock coupled = this.getCoupled(coupler);
+				EntityCoupleableRollingStock coupled = this.getCoupled(coupler);
+				if (this.isCoupled(coupler) && this.isCouplerEngaged(coupler) && coupled != null) {
 					player.sendMessage(ChatText.COUPLER_STATUS_COUPLED.getMessage(
 							coupler,
 							coupled.getDefinition().name(),