mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-18 10:19:08 +00:00
Fix more Sync for MarkData
This commit is contained in:
1 parent
f2e324b10a
commit
9462587e51
2 files changed
+8
-9
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user