From 9462587e5166b6921d8eb691a7a2fb5a0eb0d004 Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Thu, 7 Mar 2024 22:27:34 -0500
Subject: [PATCH] Fix more Sync for MarkData

---
 .../npcs/controllers/PlayerQuestController.java      | 12 ++++++------
 .../noppes/npcs/controllers/data/Availability.java   |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java
index bb462965c..f7e80707f 100644
--- a/src/main/java/noppes/npcs/controllers/PlayerQuestController.java
+++ b/src/main/java/noppes/npcs/controllers/PlayerQuestController.java
@@ -18,17 +18,17 @@ import java.util.Vector;
 public class PlayerQuestController {
 
 	public static boolean hasActiveQuests(EntityPlayer player){
-		PlayerQuestData data = PlayerDataController.Instance.getPlayerData(player).questData;
+		PlayerQuestData data = PlayerData.get(player).questData;
 		return !data.activeQuests.isEmpty();
 	}
 
 	public static boolean isQuestActive(EntityPlayer player, int quest){
-		PlayerQuestData data = PlayerDataController.Instance.getPlayerData(player).questData;
+		PlayerQuestData data = PlayerData.get(player).questData;
 		return data.activeQuests.containsKey(quest);
 	}
 
 	public static boolean isQuestFinished(EntityPlayer player, int questid){
-		PlayerQuestData data = PlayerDataController.Instance.getPlayerData(player).questData;
+		PlayerQuestData data = PlayerData.get(player).questData;
 		return data.finishedQuests.containsKey(questid);
 	}
 
@@ -57,7 +57,7 @@ public class PlayerQuestController {
 	}
 
 	public static void setQuestFinished(Quest quest, EntityPlayer player){
-		PlayerData playerdata = PlayerDataController.Instance.getPlayerData(player);
+		PlayerData playerdata = PlayerData.get(player);
 		PlayerQuestData data = playerdata.questData;
 		QuestData questData = data.activeQuests.get(quest.id);
 		data.activeQuests.remove(quest.id);
@@ -80,7 +80,7 @@ public class PlayerQuestController {
 	}
 
     public static void setQuestPartyFinished(Quest quest, EntityPlayer player, QuestData questData ){
-        PlayerData playerdata = PlayerDataController.Instance.getPlayerData(player);
+        PlayerData playerdata = PlayerData.get(player);
         PlayerQuestData data = playerdata.questData;
         data.activeQuests.remove(quest.id);
         if(quest.repeat == EnumQuestRepeat.RLDAILY || quest.repeat == EnumQuestRepeat.RLWEEKLY)
@@ -133,7 +133,7 @@ public class PlayerQuestController {
 	public static Vector<Quest> getActiveQuests(EntityPlayer player)
 	{
 		Vector<Quest> quests = new Vector<Quest>();
-		PlayerQuestData data = PlayerDataController.Instance.getPlayerData(player).questData;
+		PlayerQuestData data = PlayerData.get(player).questData;
 		for(QuestData questdata: data.activeQuests.values()){
 			if(questdata.quest == null)
 				continue;
diff --git a/src/main/java/noppes/npcs/controllers/data/Availability.java b/src/main/java/noppes/npcs/controllers/data/Availability.java
index 02e79be6e..791eb8619 100644
--- a/src/main/java/noppes/npcs/controllers/data/Availability.java
+++ b/src/main/java/noppes/npcs/controllers/data/Availability.java
@@ -9,7 +9,6 @@ import noppes.npcs.api.entity.IPlayer;
 import noppes.npcs.api.handler.data.IAvailability;
 import noppes.npcs.constants.*;
 import noppes.npcs.controllers.FactionController;
-import noppes.npcs.controllers.PlayerDataController;
 import noppes.npcs.controllers.PlayerQuestController;
 import noppes.npcs.scripted.CustomNPCsException;
 
@@ -185,7 +184,7 @@ public class Availability implements ICompatibilty, IAvailability {
 		if(faction == null)
 			return true;
 
-		PlayerFactionData data = PlayerDataController.Instance.getPlayerData(player).factionData;
+		PlayerFactionData data = PlayerData.get(player).factionData;
 		int points = data.getFactionPoints(id);
 
 		EnumAvailabilityFaction current = EnumAvailabilityFaction.Neutral;
@@ -209,7 +208,7 @@ public class Availability implements ICompatibilty, IAvailability {
             return false;
 		if(en == EnumAvailabilityDialog.Always)
 			return true;
-        PlayerData data = PlayerDataController.Instance.getPlayerData(player);
+        PlayerData data = PlayerData.get(player);
         if(data == null)
             return false;
 		boolean hasRead = data.dialogData.dialogsRead.contains(id);