Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-10-31 16:00:32 +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

55
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.Material;
import org.bukkit.conversations.Conversable;
import org.bukkit.conversations.Conversation;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
@ -36,18 +35,18 @@ public class NpcListener implements Listener {
@EventHandler(priority = EventPriority.LOWEST)
public void onNPCRightClick(NPCRightClickEvent evt) {
if (plugin.questFactory.selectingNPCs.contains(evt.getClicker())) {
evt.getClicker().sendMessage(ChatColor.GREEN + evt.getNPC().getName() + ": " + ChatColor.DARK_GREEN + "ID " + evt.getNPC().getId());
return;
}
if (evt.getClicker().isConversing() == false) {
final Player player = evt.getClicker();
final Quester quester = plugin.getQuester(player.getUniqueId());
boolean delivery = false;
for (Quest quest : quester.currentQuests.keySet()) {
if (quester.hasObjective(quest, "deliverItem") && player.getItemInHand() != null) {
@ -66,7 +65,7 @@ public class NpcListener implements Listener {
}
NPC clicked = evt.getNPC();
if (found != null) {
for (Integer n : quester.getCurrentStage(quest).itemDeliveryTargets) {
@ -80,30 +79,30 @@ public class NpcListener implements Listener {
break;
} else if (!hand.getType().equals(Material.AIR)){
for (Integer n : quester.getCurrentStage(quest).itemDeliveryTargets) {
if (n == clicked.getId()) {
String text = "";
if (hand.hasItemMeta()) {
text += ChatColor.LIGHT_PURPLE + "" + ChatColor.ITALIC + (hand.getItemMeta().hasDisplayName() ? hand.getItemMeta().getDisplayName() + ChatColor.GRAY + " (" : "");
}
text += ChatColor.AQUA + Quester.prettyItemString(hand.getType().name()) + (hand.getDurability() != 0 ? (":" + ChatColor.BLUE + hand.getDurability()) : "") + ChatColor.GRAY;
if (hand.hasItemMeta()) {
text += (hand.getItemMeta().hasDisplayName() ? ")" : "");
}
text += " x " + ChatColor.DARK_AQUA + hand.getAmount() + ChatColor.GRAY;
evt.getClicker().sendMessage(Lang.get("questInvalidDeliveryItem").replaceAll("<item>", text));
break;
}
}
break;
}
}
@ -111,7 +110,7 @@ public class NpcListener implements Listener {
}
if (plugin.questNPCs.contains(evt.getNPC()) && delivery == false) {
if (plugin.checkQuester(player.getUniqueId()) == false) {
boolean hasObjective = false;
@ -123,7 +122,7 @@ public class NpcListener implements Listener {
if (quester.getQuestData(quest) != null && quester.getQuestData(quest).citizensInteracted.containsKey(evt.getNPC().getId()) && quester.getQuestData(quest).citizensInteracted.get(evt.getNPC().getId()) == false) {
hasObjective = true;
}
quester.interactWithNPC(quest, evt.getNPC());
}
@ -131,7 +130,7 @@ public class NpcListener implements Listener {
}
if (!hasObjective) {
LinkedList<Quest> npcQuests = new LinkedList<Quest>();
for (Quest q : plugin.getQuests()) {
@ -148,7 +147,7 @@ public class NpcListener implements Listener {
}
}
if (npcQuests.isEmpty() == false && npcQuests.size() >= 1) {
if (plugin.questNPCGUIs.contains(evt.getNPC().getId())) {
@ -156,13 +155,13 @@ public class NpcListener implements Listener {
return;
}
Conversation c = plugin.NPCConversationFactory.buildConversation((Conversable) player);
Conversation c = plugin.NPCConversationFactory.buildConversation(player);
c.getContext().setSessionData("quests", npcQuests);
c.getContext().setSessionData("npc", evt.getNPC().getName());
c.begin();
} else if (npcQuests.size() == 1) {
Quest q = npcQuests.get(0);
if (!quester.completedQuests.contains(q.name)) {
@ -177,7 +176,7 @@ public class NpcListener implements Listener {
player.sendMessage(msg);
}
plugin.conversationFactory.buildConversation((Conversable) player).begin();
plugin.conversationFactory.buildConversation(player).begin();
} else if (quester.currentQuests.containsKey(q) == false) {
@ -206,7 +205,7 @@ public class NpcListener implements Listener {
player.sendMessage(msg);
}
plugin.conversationFactory.buildConversation((Conversable) player).begin();
plugin.conversationFactory.buildConversation(player).begin();
}
} else if (quester.currentQuests.containsKey(q) == false) {
@ -217,18 +216,20 @@ public class NpcListener implements Listener {
}
} else {
evt.getClicker().sendMessage(ChatColor.YELLOW + Lang.get("noMoreQuest"));
}
}
evt.getClicker().sendMessage(ChatColor.YELLOW + "No more quests available.");
}
}
}
}
@EventHandler
@ -247,7 +248,7 @@ public class NpcListener implements Listener {
EntityDamageByEntityEvent damageEvent = (EntityDamageByEntityEvent) evt.getNPC().getEntity().getLastDamageCause();
Entity damager = damageEvent.getDamager();
if (damager != null) {
if (damager instanceof Projectile) {

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