force the dismount from client and server side

Elite-Modding-Team · Aug 25, 2024 · d237658 · d237658
1 parent 2c40070
commit d237658
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/drzhark/mocreatures/network/MoCMessageHandler.java b/src/main/java/drzhark/mocreatures/network/MoCMessageHandler.java
@@ -160,11 +160,12 @@ public void run() {
                 MoCProxyClient.mc.displayGuiScreen(new MoCGUIEntityNamer(((IMoCEntity) entity), ((IMoCEntity) entity).getPetName()));
             } else if (this.message instanceof MoCMessageDismountRidingEntityClient) {
                 MoCMessageDismountRidingEntityClient message = (MoCMessageDismountRidingEntityClient) this.message;
-                Entity entity = MoCProxyClient.mc.player.world.getEntityByID(message.passengerId);
-                if (entity instanceof IMoCEntity) {
-                    EntityPlayer player = entity.getRidingEntity() instanceof EntityPlayer ? (EntityPlayer) entity.getRidingEntity() : null;
+                Entity passenger = MoCProxyClient.mc.player.world.getEntityByID(message.passengerId);
+                if (passenger instanceof IMoCEntity) {
+                    EntityPlayer player = passenger.getRidingEntity() instanceof EntityPlayer ? (EntityPlayer) passenger.getRidingEntity() : null;
                     if (player != null) {
-                        entity.setPosition(player.posX, player.posY + 1D, player.posZ);
+                        passenger.dismountRidingEntity();
+                        passenger.setPosition(player.posX, player.posY + 2D, player.posZ);
                     }
                 }
             }

diff --git a/src/main/java/drzhark/mocreatures/network/message/MoCMessageDismountRidingEntityServer.java b/src/main/java/drzhark/mocreatures/network/message/MoCMessageDismountRidingEntityServer.java
@@ -36,7 +36,7 @@ public IMessage onMessage(MoCMessageDismountRidingEntityServer message, MessageC
         Entity entity = player.world.getEntityByID(message.passengerId);
         if (entity instanceof IMoCEntity) {
             entity.dismountRidingEntity();
-            entity.setPosition(player.posX, player.posY + 1D, player.posZ);
+            entity.setPosition(player.posX, player.posY + 2D, player.posZ);
         }
         return null;
     }