mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity

Update Talisman.java

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-10-30 23:05:55 +01:00 committed by GitHub
parent e953eb1c81
commit 3471932050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java
View File

@ -182,19 +182,27 @@ public class Talisman extends SlimefunItem {
ItemStack possibleTalisman = retrieveTalismanFromInventory(p.getInventory(), talisman.getItem()); ItemStack possibleTalisman = retrieveTalismanFromInventory(p.getInventory(), talisman.getItem());
if (possibleTalisman != null && Slimefun.hasUnlocked(p, talisman, true)) { if (possibleTalisman != null) {
if (Slimefun.hasUnlocked(p, talisman, true)) {
activateTalisman(e, p, p.getInventory(), talisman, possibleTalisman); activateTalisman(e, p, p.getInventory(), talisman, possibleTalisman);
return possibleTalisman; return possibleTalisman;
} else {
return null;
}
} }
possibleTalisman = retrieveTalismanFromInventory(p.getEnderChest(), talisman.getEnderVariant()); possibleTalisman = retrieveTalismanFromInventory(p.getEnderChest(), talisman.getEnderVariant());
if (possibleTalisman != null && Slimefun.hasUnlocked(p, talisman, true)) { if (possibleTalisman != null) {
if (Slimefun.hasUnlocked(p, talisman, true)) {
activateTalisman(e, p, p.getEnderChest(), talisman, possibleTalisman); activateTalisman(e, p, p.getEnderChest(), talisman, possibleTalisman);
return possibleTalisman; return possibleTalisman;
} else {
return null;
}
} }
return possibleTalisman; return null;
} }
@Nullable @Nullable