diff --git a/src/games/stendhal/server/core/rp/StendhalQuestSystem.java b/src/games/stendhal/server/core/rp/StendhalQuestSystem.java index 10819868765..577efd82b8d 100644 --- a/src/games/stendhal/server/core/rp/StendhalQuestSystem.java +++ b/src/games/stendhal/server/core/rp/StendhalQuestSystem.java @@ -120,6 +120,7 @@ public void init() { loadQuest(new FishSoup()); loadQuest(new FishSoupForHughie()); loadQuest(new FruitsForCoralia()); + loadQuest(new GoodiesForRudolph()); loadQuest(new GuessKills()); loadQuest(new HatForMonogenes()); loadQuest(new HelpTomi()); @@ -197,9 +198,6 @@ public void init() { loadQuest(new ZekielsPracticalTestQuest()); loadQuest(new ZooFood()); - if (Occasion.CHRISTMAS) { - loadQuest(new GoodiesForRudolph()); - } if (Occasion.EASTER) { loadQuest(new EasterGiftsForChildren()); } diff --git a/src/games/stendhal/server/maps/quests/GoodiesForRudolph.java b/src/games/stendhal/server/maps/quests/GoodiesForRudolph.java index 062755be26d..dbd6192ded0 100644 --- a/src/games/stendhal/server/maps/quests/GoodiesForRudolph.java +++ b/src/games/stendhal/server/maps/quests/GoodiesForRudolph.java @@ -17,6 +17,7 @@ import java.util.LinkedList; import java.util.List; +import games.stendhal.common.constants.Occasion; import games.stendhal.server.entity.npc.ChatAction; import games.stendhal.server.entity.npc.ConversationPhrases; import games.stendhal.server.entity.npc.ConversationStates; @@ -111,6 +112,22 @@ public List getHistory(final Player player) { return res; } + /** + * Details are added to travel log if Christmas is active or player has completed quest. + * + * @param player + * Player for whom details are requested. + * @return + * `true` if Christmas is active or quest is completed. + */ + @Override + public boolean isVisibleOnQuestStatus(final Player player) { + if (Occasion.CHRISTMAS) { + return true; + } + return isCompleted(player); + } + private void prepareRequestingStep() { final SpeakerNPC npc = npcs.get("Rudolph"); @@ -234,8 +251,11 @@ public void addToWorld() { "Goodies for Rudolph", "Rudolph, Santa's favorite reindeer, desperately wants some goodies.", false); - prepareRequestingStep(); - prepareBringingStep(); + + if (Occasion.CHRISTMAS) { + prepareRequestingStep(); + prepareBringingStep(); + } } @Override