Fixed just Client Ride the Vehicles if they to mutch away

MrScautHD · Apr 14, 2022 · cf72683 · cf72683
1 parent 052ba78
commit cf72683
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 24 deletions.
diff --git a/src/main/java/net/mrscauthd/beyond_earth/entities/LanderEntity.java b/src/main/java/net/mrscauthd/beyond_earth/entities/LanderEntity.java
@@ -152,10 +152,13 @@ public void readAdditionalSaveData(CompoundTag compound) {
 	@Override
 	public InteractionResult interact(Player player, InteractionHand hand) {
 		super.interact(player, hand);
-		InteractionResult retval = InteractionResult.sidedSuccess(this.level.isClientSide);
+		InteractionResult result = InteractionResult.sidedSuccess(this.level.isClientSide);
 
-		if (player instanceof ServerPlayer && player.isCrouching()) {
+		if (!(player instanceof ServerPlayer)) {
+			return InteractionResult.PASS;
+		}
 
+		if (player.isCrouching()) {
 			NetworkHooks.openGui((ServerPlayer) player, new MenuProvider() {
 				@Override
 				public Component getDisplayName() {
@@ -172,11 +175,11 @@ public AbstractContainerMenu createMenu(int id, Inventory inventory, Player play
 				buf.writeVarInt(this.getId());
 			});
 
-			return retval;
+			return result;
 		}
 
 		player.startRiding(this);
-		return retval;
+		return result;
 	}
 
 	public ItemStackHandler getInventory() {

diff --git a/src/main/java/net/mrscauthd/beyond_earth/entities/RocketTier1Entity.java b/src/main/java/net/mrscauthd/beyond_earth/entities/RocketTier1Entity.java
@@ -68,9 +68,13 @@ protected void spawnRocketItem() {
 	@Override
 	public InteractionResult interact(Player player, InteractionHand hand) {
 		super.interact(player, hand);
-		InteractionResult retval = InteractionResult.sidedSuccess(this.level.isClientSide);
-		if (player instanceof ServerPlayer && player.isCrouching()) {
+		InteractionResult result = InteractionResult.sidedSuccess(this.level.isClientSide);
 
+		if (!(player instanceof ServerPlayer)) {
+			return InteractionResult.PASS;
+		}
+
+		if (player.isCrouching()) {
 			NetworkHooks.openGui((ServerPlayer) player, new MenuProvider() {
 				@Override
 				public Component getDisplayName() {
@@ -87,11 +91,11 @@ public AbstractContainerMenu createMenu(int id, Inventory inventory, Player play
 				buf.writeVarInt(this.getId());
 			});
 
-			return retval;
+			return result;
 		}
 
 		player.startRiding(this);
-		return retval;
+		return result;
 	}
 
 	@Override

diff --git a/src/main/java/net/mrscauthd/beyond_earth/entities/RocketTier2Entity.java b/src/main/java/net/mrscauthd/beyond_earth/entities/RocketTier2Entity.java
@@ -67,10 +67,13 @@ protected void spawnRocketItem() {
 	@Override
 	public InteractionResult interact(Player player, InteractionHand hand) {
 		super.interact(player, hand);
-		InteractionResult retval = InteractionResult.sidedSuccess(this.level.isClientSide);
+		InteractionResult result = InteractionResult.sidedSuccess(this.level.isClientSide);
 
-		if (player instanceof ServerPlayer && player.isCrouching()) {
+		if (!(player instanceof ServerPlayer)) {
+			return InteractionResult.PASS;
+		}
 
+		if (player.isCrouching()) {
 			NetworkHooks.openGui((ServerPlayer) player, new MenuProvider() {
 				@Override
 				public Component getDisplayName() {
@@ -87,11 +90,11 @@ public AbstractContainerMenu createMenu(int id, Inventory inventory, Player play
 				buf.writeVarInt(this.getId());
 			});
 
-			return retval;
+			return result;
 		}
 
 		player.startRiding(this);
-		return retval;
+		return result;
 	}
 
 	@Override

diff --git a/src/main/java/net/mrscauthd/beyond_earth/entities/RocketTier3Entity.java b/src/main/java/net/mrscauthd/beyond_earth/entities/RocketTier3Entity.java
@@ -67,10 +67,13 @@ protected void spawnRocketItem() {
 	@Override
 	public InteractionResult interact(Player player, InteractionHand hand) {
 		super.interact(player, hand);
-		InteractionResult retval = InteractionResult.sidedSuccess(this.level.isClientSide);
+		InteractionResult result = InteractionResult.sidedSuccess(this.level.isClientSide);
 
-		if (player instanceof ServerPlayer && player.isCrouching()) {
+		if (!(player instanceof ServerPlayer)) {
+			return InteractionResult.PASS;
+		}
 
+		if (player.isCrouching()) {
 			NetworkHooks.openGui((ServerPlayer) player, new MenuProvider() {
 				@Override
 				public Component getDisplayName() {
@@ -87,11 +90,11 @@ public AbstractContainerMenu createMenu(int id, Inventory inventory, Player play
 				buf.writeVarInt(this.getId());
 			});
 
-			return retval;
+			return result;
 		}
 
 		player.startRiding(this);
-		return retval;
+		return result;
 	}
 
 	@Override

diff --git a/src/main/java/net/mrscauthd/beyond_earth/entities/RocketTier4Entity.java b/src/main/java/net/mrscauthd/beyond_earth/entities/RocketTier4Entity.java
@@ -67,10 +67,13 @@ protected void spawnRocketItem() {
 	@Override
 	public InteractionResult interact(Player player, InteractionHand hand) {
 		super.interact(player, hand);
-		InteractionResult retval = InteractionResult.sidedSuccess(this.level.isClientSide);
+		InteractionResult result = InteractionResult.sidedSuccess(this.level.isClientSide);
 
-		if (player instanceof ServerPlayer && player.isCrouching()) {
+		if (!(player instanceof ServerPlayer)) {
+			return InteractionResult.PASS;
+		}
 
+		if (player.isCrouching()) {
 			NetworkHooks.openGui((ServerPlayer) player, new MenuProvider() {
 				@Override
 				public Component getDisplayName() {
@@ -87,11 +90,11 @@ public AbstractContainerMenu createMenu(int id, Inventory inventory, Player play
 				buf.writeVarInt(this.getId());
 			});
 
-			return retval;
+			return result;
 		}
 
 		player.startRiding(this);
-		return retval;
+		return result;
 	}
 
 	@Override

diff --git a/src/main/java/net/mrscauthd/beyond_earth/entities/RoverEntity.java b/src/main/java/net/mrscauthd/beyond_earth/entities/RoverEntity.java
@@ -260,10 +260,13 @@ public void readAdditionalSaveData(CompoundTag compound) {
     @Override
     public InteractionResult interact(Player player, InteractionHand hand) {
         super.interact(player, hand);
-        InteractionResult retval = InteractionResult.sidedSuccess(this.level.isClientSide);
+        InteractionResult result = InteractionResult.sidedSuccess(this.level.isClientSide);
 
-        if (player instanceof ServerPlayer && player.isCrouching()) {
+        if (!(player instanceof ServerPlayer)) {
+            return InteractionResult.PASS;
+        }
 
+        if (player.isCrouching()) {
             NetworkHooks.openGui((ServerPlayer) player, new MenuProvider() {
                 @Override
                 public Component getDisplayName() {
@@ -280,11 +283,11 @@ public AbstractContainerMenu createMenu(int id, Inventory inventory, Player play
                 buf.writeVarInt(this.getId());
             });
 
-            return retval;
+            return result;
         }
 
         player.startRiding(this);
-        return retval;
+        return result;
     }
 
     public boolean getforward() {