diff --git a/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java b/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java index b256be061..5c63b9ba5 100644 --- a/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java +++ b/Server/src/main/java/core/game/content/ttrail/ClueScrollPlugin.java @@ -78,7 +78,7 @@ public abstract class ClueScrollPlugin extends MapZone implements Plugin /** * Rewards the player with a casket. * @param player the player. - * @param casket if we give a ckaset. + * @param casket if we give a casket. */ public void reward(Player player, boolean casket) { Item clue = player.getInventory().getItem(new Item(getClueId())); diff --git a/Server/src/main/java/core/game/content/ttrail/CoordinateClueScroll.java b/Server/src/main/java/core/game/content/ttrail/CoordinateClueScroll.java index 2fd0096ba..c3a4476ce 100644 --- a/Server/src/main/java/core/game/content/ttrail/CoordinateClueScroll.java +++ b/Server/src/main/java/core/game/content/ttrail/CoordinateClueScroll.java @@ -61,17 +61,17 @@ public abstract class CoordinateClueScroll extends MapClueScroll { @Override public void dig(Player player) { - /*int killed = player.getAttribute("killed-wizard", -1); - if (getLevel() == ClueLevel.HARD && killed == -1) { + int killedWizardClueId = player.getAttribute("killed-wizard", -1); + if (getLevel() == ClueLevel.HARD && (killedWizardClueId == -1 || killedWizardClueId != getClueId())) { NPC wizard = player.getAttribute("t-wizard", null); if (wizard != null && wizard.isActive()) { return; } spawnWizard(player); return; - }*/ + } super.dig(player); - //player.removeAttribute("killed-wizard"); + player.removeAttribute("killed-wizard"); } /** @@ -98,5 +98,4 @@ public abstract class CoordinateClueScroll extends MapClueScroll { public String getClue() { return clue; } - } diff --git a/Server/src/main/java/core/game/content/ttrail/MapClueScroll.java b/Server/src/main/java/core/game/content/ttrail/MapClueScroll.java index a0b5b5e88..67312590b 100644 --- a/Server/src/main/java/core/game/content/ttrail/MapClueScroll.java +++ b/Server/src/main/java/core/game/content/ttrail/MapClueScroll.java @@ -61,8 +61,7 @@ public abstract class MapClueScroll extends ClueScrollPlugin { p.sendMessage("Nothing interesting happens."); return false; } - reward(p, false); - level.open(p, null); + reward(p); return true; } }