From 04e4cee6bbf7cc745b59e9737b4d9c5e58b4cae6 Mon Sep 17 00:00:00 2001
From: Cekis <cekisswg@gmail.com>
Date: Wed, 25 May 2016 23:19:13 +0100
Subject: [PATCH] Added error avoidance when player goes from one mount to the
 other (i.e. they're already mounted)

---
 .../game/script/ai/pet_control_device.java    | 34 ++++---------------
 1 file changed, 6 insertions(+), 28 deletions(-)
 mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/ai/pet_control_device.java

diff --git a/sku.0/sys.server/compiled/game/script/ai/pet_control_device.java b/sku.0/sys.server/compiled/game/script/ai/pet_control_device.java
old mode 100644
new mode 100755
index a177e2769..e78a59657
--- a/sku.0/sys.server/compiled/game/script/ai/pet_control_device.java
+++ b/sku.0/sys.server/compiled/game/script/ai/pet_control_device.java
@@ -1,35 +1,9 @@
 package script.ai;
 
 import script.*;
-import script.base_class.*;
-import script.combat_engine.*;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.Vector;
-import script.base_script;
+import script.library.*;
 
-import script.library.ai_lib;
-import script.library.battlefield;
-import script.library.beast_lib;
-import script.library.bio_engineer;
-import script.library.buff;
-import script.library.callable;
-import script.library.consumable;
-import script.library.create;
-import script.library.factions;
-import script.library.healing;
-import script.library.hue;
-import script.library.incubator;
-import script.library.pet_lib;
-import script.library.prose;
-import script.library.space_crafting;
-import script.library.space_transition;
-import script.library.space_utils;
-import script.library.stealth;
-import script.library.sui;
-import script.library.target_dummy;
-import script.library.utils;
-import script.library.vehicle;
+import java.util.Vector;
 
 public class pet_control_device extends script.base_script
 {
@@ -566,6 +540,10 @@ public class pet_control_device extends script.base_script
             sendSystemMessage(player, SHAPECHANGE);
             return SCRIPT_CONTINUE;
         }
+        if (pet_lib.isMounted(player))
+        {
+            dismountCreature(player);
+        }
         mountCreature(player, pet);
         pet_lib.setMountedMovementRate(player, pet);
         return SCRIPT_CONTINUE;