diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java index 14d417a4..f3adfb62 100644 --- a/src/engine/server/world/WorldServer.java +++ b/src/engine/server/world/WorldServer.java @@ -632,7 +632,7 @@ public class WorldServer { } //add extra vendors for lakebane try { - NPC runeMerchant = NPC.createNPC("Runey", 1200, new Vector3fImmutable(88862f, 33f, 44997f), Guild.getGuild(6), ZoneManager.getZoneByUUID(656), (short) 70, null); + NPC runeMerchant = NPC.createNPC("Runey", 1200, Vector3fImmutable.ZERO, Guild.getGuild(6), ZoneManager.getZoneByUUID(656), (short) 70, null); runeMerchant.sellPercent = 0; Building sdrHut = BuildingManager.getBuilding(27979); runeMerchant.buildingUUID = sdrHut.getObjectUUID(); @@ -646,6 +646,22 @@ public class WorldServer { catch(Exception e){ Logger.error("FAILED TO ADD RUNE MERCHANT"); } + try { + NPC resourceMerchant = NPC.createNPC("Resources", 960124, Vector3fImmutable.ZERO, Guild.getGuild(6), ZoneManager.getZoneByUUID(656), (short) 70, null); + resourceMerchant.sellPercent = 0; + Building sdrHut = BuildingManager.getBuilding(27984); + resourceMerchant.buildingUUID = sdrHut.getObjectUUID(); + resourceMerchant.building = sdrHut; + NPCManager.slotCharacterInBuilding(resourceMerchant); + resourceMerchant.setLoc(resourceMerchant.bindLoc); + //for(MobEquipment item : resourceMerchant.contract.getSellInventory()){ + // item.magicValue = 10000000; + //} + //resourceMerchant.contract.getSellInventory() + } + catch(Exception e){ + Logger.error("FAILED TO ADD RUNE MERCHANT"); + } Logger.info("time to load World Objects: " + (System.currentTimeMillis() - start) + " ms"); }