remove dungeon teleport from base game

src/engine/Dungeons/Dungeon.java

@@ -76,15 +76,15 @@ public class Dungeon {
         writer.putInt(rulingGuild.getObjectType().ordinal());
         writer.putInt(rulingGuild.getObjectUUID());
 
-        writer.putString(rulingGuild.getName());
+        writer.putString("Whitehorn Militants"); // guild name
-        writer.putString("");
+        writer.putString("In the Citadel, We Fight!"); // motto
         writer.putString(rulingGuild.getLeadershipType());
 
         // Serialize guild ruler's name
         // If tree is abandoned blank out the name
         // to allow them a rename.
 
-        writer.putString("");
+        writer.putString("Kol'roth The Destroyer");//sovreign
 
         writer.putInt(rulingGuild.getCharter());
         writer.putInt(0); // always 00000000
@@ -119,19 +119,15 @@ public class Dungeon {
 
         // Serialize nation name
 
-        if (rulingNation.isEmptyGuild())
+        writer.putString("Whitehorn Militants"); //nation name
-            writer.putString("None");
-        else
-            writer.putString(rulingNation.getName());
 
-        writer.putInt(1);
+        writer.putInt(-1);//city rank, -1 puts it at top of list always
 
         writer.putInt(0xFFFFFFFF);
 
         writer.putInt(0);
 
-        if (rulingNation.isEmptyGuild())
+        writer.putString("Kol'roth The Destroyer");//nation ruler
-            writer.putString(" ");
 
         writer.putLocalDateTime(LocalDateTime.now());
 

src/engine/net/client/handlers/MerchantMsgHandler.java

@@ -282,6 +282,14 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
                 }
             }
             if(mineTele == null){
+                //must be the dungeon request?
+                Vector3fImmutable loc = Vector3fImmutable.getRandomPointOnCircle(BuildingManager.getBuilding(2827951).loc,30f);
+                ChatManager.chatSystemInfo(player, "You Will Teleport To Whitehorn Citadel In " + 10 +  " Seconds.");
+                if (10 > 0) {
+                    //TODO add timer to teleport
+                    TeleportJob tj = new TeleportJob(player, npc, loc, origin, true);
+                    JobScheduler.getInstance().scheduleJob(tj, 10 * 1000);
+                }
                 return;
             }else {
                 int time = MBServerStatics.TELEPORT_TIME_IN_SECONDS;

src/engine/net/client/msg/TeleportRepledgeListMsg.java

@@ -109,7 +109,7 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
         for (int i = 0; i < 3; i++)
             writer.putInt(0);
 
-        writer.putInt(cities.size() + mines.size() + 1);
+        writer.putInt(cities.size() + mines.size());// + 1);
 
         for (City city : cities)
             City.serializeForClientMsg(city, writer);
@@ -117,7 +117,7 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
         for(Mine mine : mines)
             Mine.serializeForClientMsgTeleport(mine, writer);
 
-        Dungeon.serializeForClientMsgTeleport(writer);
+        //Dungeon.serializeForClientMsgTeleport(writer);
     }
 
     public PlayerCharacter getPlayer() {