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

Hotfix for new item flags

Browse Source
This commit is contained in:
PikaMug 2024-06-17 20:02:15 -04:00
parent aa79aebcc8
commit 8eec73bf04
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/me/pikamug/quests/listeners/BukkitPlayerListener.java
View File

@ -128,7 +128,8 @@ public class BukkitPlayerListener implements Listener {
for (final Quest quest : plugin.getLoadedQuests()) { for (final Quest quest : plugin.getLoadedQuests()) {
final BukkitQuest bukkitQuest = (BukkitQuest)quest; final BukkitQuest bukkitQuest = (BukkitQuest)quest;
if (bukkitQuest.getGUIDisplay() != null) { if (bukkitQuest.getGUIDisplay() != null) {
if (BukkitItemUtil.compareItems(clicked, bukkitQuest.prepareDisplay(quester), false) == 0) { final int i = BukkitItemUtil.compareItems(clicked, bukkitQuest.prepareDisplay(quester), false);
if (i == 0 || i == -7) {
if (quester.canAcceptOffer(quest, true)) { if (quester.canAcceptOffer(quest, true)) {
try { try {
quester.takeQuest(quest, false); quester.takeQuest(quest, false);

10
core/src/main/java/me/pikamug/quests/util/BukkitItemUtil.java
View File

@ -51,8 +51,8 @@ public class BukkitItemUtil {
* -4 if stack display name/lore is unequal<br> * -4 if stack display name/lore is unequal<br>
* -5 if stack enchantments are unequal<br> * -5 if stack enchantments are unequal<br>
* -6 if stack stored enchants are unequal<br> * -6 if stack stored enchants are unequal<br>
* -7 if stack item flags are unequal * -7 if stack item flags are unequal<br>
* -8 if stack Written Book data is unequal * -8 if stack Written Book data is unequal<br>
* -9 if stack Potion type is unequal * -9 if stack Potion type is unequal
*/ */
public static int compareItems(final ItemStack one, final ItemStack two, final boolean ignoreAmount) { public static int compareItems(final ItemStack one, final ItemStack two, final boolean ignoreAmount) {
@ -75,9 +75,9 @@ public class BukkitItemUtil {
* -4 if stack display name/lore is unequal<br> * -4 if stack display name/lore is unequal<br>
* -5 if stack enchantments are unequal<br> * -5 if stack enchantments are unequal<br>
* -6 if stack stored enchants are unequal<br> * -6 if stack stored enchants are unequal<br>
* -7 if stack item flags are unequal * -7 if stack item flags are unequal<br>
* -8 if stack Written Book data is unequal * -8 if stack Written Book data is unequal<br>
* -9 if stack Potion type is unequal * -9 if stack Potion type is unequal<br>
* -10 if stack Tropical Fish variant is unequal * -10 if stack Tropical Fish variant is unequal
*/ */
public static int compareItems(final ItemStack one, final ItemStack two, final boolean ignoreAmount, public static int compareItems(final ItemStack one, final ItemStack two, final boolean ignoreAmount,