Fix passing through gate to training grounds + make ::shop bots tele to current loc first try (#410)

2006Redone Server/src/main/java/com/rebotted/game/bots/Bot.java

@@ -31,16 +31,13 @@ public class Bot {
         botClient.isActive = true;
         botClient.disconnected = false;
         botClient.npcCanAttack = false;
+        botClient.canWalkTutorial = true;
+        botClient.tutorialProgress = 36;
         GameEngine.playerHandler.newPlayerClient(botClient);
 
         loadPlayerInfo(botClient, username, "bot_password", false);
 
-        System.out.println("x is " + x);
-        if (x == null) {
-            System.out.println("Bot should be at " + botClient.getX() + ", " + botClient.getY());
-        }
         if (x != null) {
-            System.out.println("Moving player to " + x + "," + y + "," + z);
             botClient.getPlayerAssistant().movePlayer(x, y, z);
         }
         new TradeChat().run();

2006Redone Server/src/main/java/com/rebotted/game/objects/ObjectsActions.java

@@ -114,7 +114,7 @@ public class ObjectsActions {
         player.getDoubleGates().useDoubleGate(player, objectType);
         PassDoor.processDoor(player, objectType);
         AbyssalHandler.handleAbyssalTeleport(player, objectType);
-		OpenObject.interactObject(player, objectType, objectType == 399 ? true : false);
+        OpenObject.interactObject(player, objectType, objectType == 399);
         // if its a rock we can mine, mine it
         if (Mining.rockExists(objectType))
             player.getMining().startMining(player, objectType, player.objectX, player.objectY, player.clickObjectType);
@@ -303,6 +303,16 @@ public class ObjectsActions {
                 }
                 break;
 
+            case 2039:
+            case 2041:
+                if (player.absY == 3356) {
+                    player.getPlayerAssistant().movePlayer(player.absX, player.absY + 1, 0);
+                } else if (player.absY == 3357) {
+                    player.getPlayerAssistant().movePlayer(player.absX, player.absY - 1, 0);
+                }
+                player.getPacketSender().sendMessage("You pass through the gate.");
+                break;
+
             case 69:
             case 2178:
                 //if (c.objectX == 2675 && c.objectY == 3170) {
@@ -1169,6 +1179,7 @@ public class ObjectsActions {
 
                             container.stop();
                         }
+
                         @Override
                         public void stop() {
 
@@ -1220,6 +1231,7 @@ public class ObjectsActions {
 
                             container.stop();
                         }
+
                         @Override
                         public void stop() {
 
@@ -1249,6 +1261,7 @@ public class ObjectsActions {
 
                             container.stop();
                         }
+
                         @Override
                         public void stop() {
 
@@ -2100,8 +2113,7 @@ public class ObjectsActions {
                 if (player.shieldArrav >= 6 && player.getItemAssistant().playerHasItem(759)) {
                     GameEngine.objectHandler.createAnObject(player, 2604, objectX, objectY, player.heightLevel, 0);
                     Region.addObject(2604, objectX, objectY, 0, 0, 0, false);
-			}
+                } else {
-			else {
                     player.getPacketSender().sendMessage("It's locked, maybe I can get the key from somewhere.");
                 }
                 break;