Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tropical Fish variant must match, fixes #1909

This commit is contained in:
PikaMug 2022-03-26 02:21:25 -04:00
parent d1875ae377
commit c999f7697d
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,6 +157,10 @@ public class NpcListener implements Listener {
player.sendMessage(ChatColor.GRAY + Lang.get(player, "difference")
.replace("<data>", "potion type"));
break;
case -10:
player.sendMessage(ChatColor.GRAY + Lang.get(player, "difference")
.replace("<data>", "fish variant"));
break;
default:
player.sendMessage(ChatColor.GRAY + Lang.get(player, "difference")
.replace("<data>", "unknown"));

14
core/src/main/java/me/blackvein/quests/util/ItemUtil.java
View File

@ -80,6 +80,7 @@ public class ItemUtil {
* -7 if stack item flags are unequal
* -8 if stack Written Book data is unequal
* -9 if stack Potion type is unequal
* -10 if stack Tropical Fish variant is unequal
*/
public static int compareItems(final ItemStack one, final ItemStack two, final boolean ignoreAmount,
final boolean ignoreDurability) {
@ -158,6 +159,19 @@ public class ItemUtil {
}
}
}
if (one.getItemMeta().toString().startsWith("TROPICAL_FISH_BUCKET_META")) {
final String meta1 = one.getItemMeta().toString();
final String meta2 = two.getItemMeta().toString();
if (meta1.contains("variant=") && meta2.contains("variant=")) {
final String variant1 = meta1.substring(meta1.indexOf("variant="), meta1.length() - 1);
final String variant2 = meta2.substring(meta2.indexOf("variant="), meta2.length() - 1);
if (!variant1.equals(variant2)) {
return -10;
}
} else {
return -10;
}
}
}
if (Material.getMaterial("LINGERING_POTION") == null) {
if (one.getType().equals(Material.POTION)) {