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

Use durability with GUI items for pre-1.13, fixes #935

Browse Source
This commit is contained in:
PikaMug 2019-10-01 15:36:00 -04:00
parent 53ca286093
commit f26d81e30c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/src/main/java/me/blackvein/quests/QuestFactory.java
View File

@ -1057,7 +1057,6 @@ public class QuestFactory implements ConversationAbandonedListener {
} }
if (cc.getSessionData(CK.Q_GUIDISPLAY) != null) { if (cc.getSessionData(CK.Q_GUIDISPLAY) != null) {
guiDisplay = (ItemStack) cc.getSessionData(CK.Q_GUIDISPLAY); guiDisplay = (ItemStack) cc.getSessionData(CK.Q_GUIDISPLAY);
guiDisplay = new ItemStack(guiDisplay.getType());
} }
if (cc.getSessionData(CK.REW_MONEY) != null) { if (cc.getSessionData(CK.REW_MONEY) != null) {
moneyRew = (Integer) cc.getSessionData(CK.REW_MONEY); moneyRew = (Integer) cc.getSessionData(CK.REW_MONEY);

4
main/src/main/java/me/blackvein/quests/listeners/NpcListener.java
View File

@ -201,9 +201,13 @@ public class NpcListener implements Listener {
} }
if (!plugin.getSettings().canAskConfirmation()) { if (!plugin.getSettings().canAskConfirmation()) {
quester.takeQuest(q, false); quester.takeQuest(q, false);
} else {
if (q.getGUIDisplay() != null) {
quester.showGUIDisplay(evt.getNPC(), npcQuests);
} else { } else {
plugin.getConversationFactory().buildConversation((Conversable) player).begin(); plugin.getConversationFactory().buildConversation((Conversable) player).begin();
} }
}
} else if (quester.getCurrentQuests().containsKey(q) == false) { } else if (quester.getCurrentQuests().containsKey(q) == false) {
String msg = Lang.get(player, "questMaxAllowed"); String msg = Lang.get(player, "questMaxAllowed");
msg = msg.replace("<number>", String.valueOf(plugin.getSettings().getMaxQuests())); msg = msg.replace("<number>", String.valueOf(plugin.getSettings().getMaxQuests()));