Fix Some Quest Cooldown Behavior

This commit is contained in:
Kam committed 2026-02-28 14:17:23 -05:00
1 parent 38df157c40
commit eaec10e529
7 files changed
+116 -40

No files matched your search

@@ -1,6 +1,7 @@
package noppes.npcs.controllers;
import kamkeel.npcs.controllers.ProfileController;
import kamkeel.npcs.controllers.data.profile.Profile;
import kamkeel.npcs.network.packets.data.AchievementPacket;
import kamkeel.npcs.network.packets.data.ChatAlertPacket;
import net.minecraft.entity.player.EntityPlayer;
@@ -91,7 +92,9 @@ public class PlayerQuestController {
questData.finishedQuests.put(quest.id, completeTime);
}
if (ConfigMain.ProfilesEnabled && quest.profileOptions.enableOptions && quest.profileOptions.completeControl == EnumProfileSync.Shared)
if (ConfigMain.ProfilesEnabled && quest.profileOptions.enableOptions
&& (quest.profileOptions.completeControl == EnumProfileSync.Shared
|| quest.profileOptions.cooldownControl == EnumProfileSync.Shared))
ProfileController.Instance.shareQuestCompletion(player, quest.id, completeTime);
}
@@ -125,27 +128,29 @@ public class PlayerQuestController {
if (data.activeQuests.containsKey(quest.id))
return false;
if (!data.finishedQuests.containsKey(quest.id) || quest.repeat == EnumQuestRepeat.REPEATABLE)
boolean finishedLocally = data.finishedQuests.containsKey(quest.id);
boolean completedShared = false;
boolean hasCooldownShared = false;
if (ConfigMain.ProfilesEnabled && quest.profileOptions.enableOptions) {
Profile profile = ProfileController.Instance.getProfile(player);
if (profile != null && profile.sharedQuestTimestamps.containsKey(quest.id)) {
if (quest.profileOptions.completeControl == EnumProfileSync.Shared)
completedShared = true;
if (quest.profileOptions.cooldownControl == EnumProfileSync.Shared)
hasCooldownShared = true;
}
}
boolean isFinished = finishedLocally || completedShared;
if (!isFinished && !hasCooldownShared)
return true;
if (quest.repeat == EnumQuestRepeat.REPEATABLE)
return true;
if (quest.repeat == EnumQuestRepeat.NONE)
return false;
return !isFinished;
long questTime = data.finishedQuests.get(quest.id);
if (quest.repeat == EnumQuestRepeat.MCDAILY) {
return player.worldObj.getTotalWorldTime() - questTime >= 24000;
} else if (quest.repeat == EnumQuestRepeat.MCWEEKLY) {
return player.worldObj.getTotalWorldTime() - questTime >= 168000;
} else if (quest.repeat == EnumQuestRepeat.MCCUSTOM) {
return player.worldObj.getTotalWorldTime() - questTime >= quest.customCooldown;
} else if (quest.repeat == EnumQuestRepeat.RLDAILY) {
return System.currentTimeMillis() - questTime >= 86400000;
} else if (quest.repeat == EnumQuestRepeat.RLWEEKLY) {
return System.currentTimeMillis() - questTime >= 604800000;
} else if (quest.repeat == EnumQuestRepeat.RLCUSTOM) {
return System.currentTimeMillis() - questTime >= quest.customCooldown;
}
return false;
return quest.getTimeUntilRepeat(player) <= 0;
}
public static Vector<Quest> getActiveQuests(EntityPlayer player) {
@@ -80,7 +80,9 @@ public class QuestController implements IQuestHandler {
ite.remove();
} else {
quests.put(id, quest);
if (quest.profileOptions.enableOptions && quest.profileOptions.completeControl == EnumProfileSync.Shared) {
if (quest.profileOptions.enableOptions
&& (quest.profileOptions.completeControl == EnumProfileSync.Shared
|| quest.profileOptions.cooldownControl == EnumProfileSync.Shared)) {
sharedQuests.put(id, quest);
}
}
@@ -225,7 +227,9 @@ public class QuestController implements IQuestHandler {
category.quests.put(quest.id, quest);
sharedQuests.remove(quest.id);
if (quest.profileOptions.enableOptions && quest.profileOptions.completeControl == EnumProfileSync.Shared) {
if (quest.profileOptions.enableOptions
&& (quest.profileOptions.completeControl == EnumProfileSync.Shared
|| quest.profileOptions.cooldownControl == EnumProfileSync.Shared)) {
sharedQuests.put(quest.id, quest);
}
@@ -178,19 +178,50 @@ public class Quest implements ICompatibilty, IQuest {
public long getTimeUntilRepeat(EntityPlayer player) {
if (ConfigMain.ProfilesEnabled && profileOptions.enableOptions && profileOptions.cooldownControl == EnumProfileSync.Shared) {
Profile profile = ProfileController.Instance.getProfile(player);
IPlayer iPlayer = NoppesUtilServer.getIPlayer(player);
long timeRemaining = 0L;
for (ISlot slot : profile.getSlots().values()) {
IPlayerData playerData = ProfileController.Instance.getSlotPlayerData(iPlayer, slot.getId());
IPlayerQuestData iPlayerQuestData = playerData.getQuestData();
timeRemaining = Math.max(timeRemaining, getTimeUntilRepeatQuestData(player, iPlayerQuestData));
if (profile != null) {
Long questTime = profile.sharedQuestTimestamps.get(this.id);
if (questTime == null) return 0L;
return calculateRemainingCooldown(player, questTime);
}
return timeRemaining;
}
IPlayerQuestData questData = PlayerData.get(player).getQuestData();
return getTimeUntilRepeatQuestData(player, questData);
}
public long calculateRemainingCooldown(EntityPlayer player, long questTime) {
switch (repeat) {
case MCDAILY: {
long now = player.worldObj.getTotalWorldTime();
long remainingTicks = questTime + 24000 - now;
return Math.max(0, remainingTicks * 50);
}
case MCWEEKLY: {
long now = player.worldObj.getTotalWorldTime();
long remainingTicks = questTime + 168000 - now;
return Math.max(0, remainingTicks * 50);
}
case MCCUSTOM: {
long now = player.worldObj.getTotalWorldTime();
long remainingTicks = questTime + this.customCooldown - now;
return Math.max(0, remainingTicks * 50);
}
case RLDAILY: {
long remainingMillis = questTime + 86400000 - System.currentTimeMillis();
return Math.max(0, remainingMillis);
}
case RLWEEKLY: {
long remainingMillis = questTime + 604800000 - System.currentTimeMillis();
return Math.max(0, remainingMillis);
}
case RLCUSTOM: {
long remainingMillis = questTime + this.customCooldown - System.currentTimeMillis();
return Math.max(0, remainingMillis);
}
default:
return 0L;
}
}
public long getTimeUntilRepeatQuestData(EntityPlayer player, IPlayerQuestData questData) {
long questTime = questData.getLastCompletedTime(this.id);