diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java index c04b2811..a4f22186 100644 --- a/src/engine/server/world/WorldServer.java +++ b/src/engine/server/world/WorldServer.java @@ -648,33 +648,6 @@ public class WorldServer { catch(Exception e){ Logger.error("FAILED TO ADD RUNE MERCHANT"); } - try { - Building sdrHut = BuildingManager.getBuilding(27979); - if (sdrHut.getHirelings().size() < 1) { - NPC resourceMerchant = NPC.createNPC("Resource Merchant", 900, Vector3fImmutable.ZERO, Guild.getGuild(6), ZoneManager.getZoneByUUID(656), (short) 70, null); - resourceMerchant.sellPercent = 0; - resourceMerchant.buildingUUID = sdrHut.getObjectUUID(); - resourceMerchant.building = sdrHut; - NPCManager.slotCharacterInBuilding(resourceMerchant); - resourceMerchant.setLoc(resourceMerchant.bindLoc); - //resourceMerchant.contract.getSellInventory().clear(); - //for(int resourceID : Warehouse.getMaxResources().keySet()) { - // if (resourceID == 7 || resourceID == 1580021) - // continue; - //MobLoot resource = new MobLoot(resourceMerchant, ItemBase.getItemBase(resourceID), 1, true); - //resource.setValue(Warehouse.getCostForResource(resourceID)); - //resourceMerchant.getCharItemManager().addItemToInventory(resource); - // MobEquipment resource = new MobEquipment(ItemBase.getItemBase(resourceID),0,0); - // resourceMerchant.contract.getSellInventory().add(resource); - //} - //for (MobEquipment item : resourceMerchant.contract.getSellInventory()) { - // item.magicValue = Warehouse.getCostForResource(item.getItemBase().getUUID()); - //} - } - } - catch(Exception e){ - Logger.error("FAILED TO ADD RUNE MERCHANT"); - } //try { // Building sdrHut = BuildingManager.getBuilding(27984);