Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-01-27 18:51:34 +01:00
Code Issues Projects Releases Wiki Activity

Temporary workaround for custom objectives

Browse Source
This commit is contained in:
PikaMug 2022-02-02 05:55:00 -05:00
parent 6320122549
commit 722ccf7678
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/me/blackvein/quests/module/ICustomObjective.java
View File

@ -83,7 +83,7 @@ public interface ICustomObjective {
* @param quest Current me.blackvein.quests.Quest which includes this objective
* @return data
*/
Map<String, Object> getDataForPlayer(final Player player, final ICustomObjective customObj, final IQuest quest);
Map<String, Object> getDataForPlayerTemp(final Player player, final ICustomObjective customObj, final IQuest quest);
void incrementObjective(final Player player, final ICustomObjective obj, final int count, final IQuest quest);
void incrementObjectiveTemp(final Player player, final ICustomObjective obj, final int count, final IQuest quest);
}

22
core/src/main/java/me/blackvein/quests/CustomObjective.java
View File

@ -18,6 +18,7 @@ import me.blackvein.quests.events.quester.QuesterPreUpdateObjectiveEvent;
import me.blackvein.quests.module.ICustomObjective;
import me.blackvein.quests.player.IQuester;
import me.blackvein.quests.quests.BukkitObjective;
import me.blackvein.quests.quests.IQuest;
import me.blackvein.quests.quests.IStage;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@ -31,7 +32,7 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
public abstract class CustomObjective implements ICustomObjective, Listener {
public class CustomObjective implements ICustomObjective, Listener {
private final Quests plugin = Quests.getPlugin(Quests.class);
private String name = null;
@ -161,6 +162,14 @@ public abstract class CustomObjective implements ICustomObjective, Listener {
public Map<String, Object> getDataForPlayer(final Player player, final CustomObjective customObj,
final Quest quest) {
return getDataForPlayerTemp(player, customObj, quest);
}
/**
* @deprecated Do not use
*/
public Map<String, Object> getDataForPlayerTemp(final Player player, final ICustomObjective customObj,
final IQuest quest) {
final IQuester quester = plugin.getQuester(player.getUniqueId());
if (quester != null) {
final IStage currentStage = quester.getCurrentStage(quest);
@ -191,7 +200,16 @@ public abstract class CustomObjective implements ICustomObjective, Listener {
return null;
}
public void incrementObjective(final Player player, final CustomObjective obj, final int count, final Quest quest) {
public void incrementObjective(final Player player, final CustomObjective obj, final int count,
final Quest quest) {
incrementObjectiveTemp(player, obj, count, quest);
}
/**
* @deprecated Do not use
*/
public void incrementObjectiveTemp(final Player player, final ICustomObjective obj, final int count,
final IQuest quest) {
final Quester quester = plugin.getQuester(player.getUniqueId());
if (quester != null) {
if (quester.hasCustomObjective(quest, obj.getName())) {