From 40290bdf976902e49de0dd92faf21c5eba8bd0c3 Mon Sep 17 00:00:00 2001
From: FatBoy-DOTC <justin.chucksinsulating@gmail.com>
Date: Tue, 20 Feb 2024 21:13:12 -0600
Subject: [PATCH] test rune vendor

---
 src/engine/server/world/WorldServer.java | 45 +++++++++++++-----------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java
index 14f8b9d9..7b25ff09 100644
--- a/src/engine/server/world/WorldServer.java
+++ b/src/engine/server/world/WorldServer.java
@@ -617,6 +617,11 @@ public class WorldServer {
 
 				for (NPC n : npcs) {
 					n.setObjectTypeMask(MBServerStatics.MASK_NPC);
+
+					if(n.contract.getContractID() == 1200) {
+						DbManager.NPCQueries.DELETE_NPC(n);
+						continue;
+					}
 					n.setLoc(n.getLoc());
 				}
 
@@ -632,26 +637,26 @@ public class WorldServer {
 		}
 		//add extra vendors for lakebane
 		//
-		//try {
-		//	Building sdrHut = BuildingManager.getBuilding(27979);
-		//	Zone sdr = sdrHut.parentZone;
-		//	boolean exists = false;
-		//	for(NPC merchant : sdr.zoneNPCSet)
-		//		if(merchant.contract.getContractID() == 1200)
-		//			exists = true;
-		//	if (!exists) {
-		//		NPC runeMerchant = NPC.createNPC("Runey", 1200, Vector3fImmutable.ZERO, Guild.getGuild(6), ZoneManager.getZoneByUUID(656), (short) 70, null);
-		//		runeMerchant.sellPercent = 9999.00f;
-		//		runeMerchant.buildingUUID = sdrHut.getObjectUUID();
-		//		runeMerchant.building = sdrHut;
-		//		NPCManager.slotCharacterInBuilding(runeMerchant);
-		//		runeMerchant.setLoc(runeMerchant.bindLoc);
-		//		runeMerchant.updateDatabase();
-		//	}
-		//}
-		//catch(Exception e){
-		//	Logger.error("FAILED TO ADD RUNE MERCHANT");
-		//}
+		try {
+			Building sdrHut = BuildingManager.getBuilding(27979);
+			Zone sdr = sdrHut.parentZone;
+			boolean exists = false;
+			for(NPC merchant : sdr.zoneNPCSet)
+				if(merchant.contract.getContractID() == 1200)
+					exists = true;
+			if (!exists) {
+				NPC runeMerchant = NPC.createNPC("Runey", 1200, Vector3fImmutable.ZERO, Guild.getGuild(6), ZoneManager.getZoneByUUID(656), (short) 70, null);
+				runeMerchant.sellPercent = 9999.00f;
+				runeMerchant.buildingUUID = sdrHut.getObjectUUID();
+				runeMerchant.building = sdrHut;
+				NPCManager.slotCharacterInBuilding(runeMerchant);
+				runeMerchant.setLoc(runeMerchant.bindLoc);
+				runeMerchant.updateDatabase();
+			}
+		}
+		catch(Exception e){
+			Logger.error("FAILED TO ADD RUNE MERCHANT");
+		}
 		Logger.info("time to load World Objects: " + (System.currentTimeMillis() - start) + " ms");
 	}