Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-12-22 17:17:38 +01:00
Code Issues Projects Releases Wiki Activity

Correct fix for #71, fixes #83

Browse Source
This commit is contained in:
HappyPikachu 2015-04-20 09:02:54 -04:00
parent 81b24b4b50
commit a7d6ea8885
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/me/blackvein/quests/NpcListener.java
View File

@ -13,7 +13,6 @@ import net.citizensnpcs.api.npc.NPC;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.conversations.Conversable;
import org.bukkit.conversations.Conversation; import org.bukkit.conversations.Conversation;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -156,7 +155,7 @@ public class NpcListener implements Listener {
return; return;
} }
Conversation c = plugin.NPCConversationFactory.buildConversation((Conversable) player); Conversation c = plugin.NPCConversationFactory.buildConversation(player);
c.getContext().setSessionData("quests", npcQuests); c.getContext().setSessionData("quests", npcQuests);
c.getContext().setSessionData("npc", evt.getNPC().getName()); c.getContext().setSessionData("npc", evt.getNPC().getName());
c.begin(); c.begin();
@ -177,7 +176,7 @@ public class NpcListener implements Listener {
player.sendMessage(msg); player.sendMessage(msg);
} }
plugin.conversationFactory.buildConversation((Conversable) player).begin(); plugin.conversationFactory.buildConversation(player).begin();
} else if (quester.currentQuests.containsKey(q) == false) { } else if (quester.currentQuests.containsKey(q) == false) {
@ -206,7 +205,7 @@ public class NpcListener implements Listener {
player.sendMessage(msg); player.sendMessage(msg);
} }
plugin.conversationFactory.buildConversation((Conversable) player).begin(); plugin.conversationFactory.buildConversation(player).begin();
} }
} else if (quester.currentQuests.containsKey(q) == false) { } else if (quester.currentQuests.containsKey(q) == false) {
@ -217,11 +216,13 @@ public class NpcListener implements Listener {
} }
} } else {
evt.getClicker().sendMessage(ChatColor.YELLOW + Lang.get("noMoreQuest"));
} }
evt.getClicker().sendMessage(ChatColor.YELLOW + "No more quests available."); }
} }

3
src/main/java/me/blackvein/quests/util/Lang.java
View File

@ -9,9 +9,9 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import me.blackvein.quests.Quests; import me.blackvein.quests.Quests;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
public class Lang { public class Lang {
@ -839,6 +839,7 @@ public class Lang {
langMap.put("enterAnOption", "Enter an option"); langMap.put("enterAnOption", "Enter an option");
langMap.put("questAccepted", "Quest accepted: <quest>"); langMap.put("questAccepted", "Quest accepted: <quest>");
langMap.put("currentQuest", "Current Quests:"); langMap.put("currentQuest", "Current Quests:");
langMap.put("noMoreQuest", "No more quests available.");
//Objectives //Objectives
langMap.put("damage", "Damage"); langMap.put("damage", "Damage");