Repo-Mirror/Talismans
9
0
Fork 0
Code Issues Releases 1 Activity

Added weird edge case where ender chest was null

Browse Source
This commit is contained in:
Auxilor
2021-10-08 21:58:30 +01:00
parent 5eb98fda3a
commit fdc01d66a4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java
View File

@@ -11,6 +11,7 @@ import org.bukkit.NamespacedKey;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.block.ShulkerBox; import org.bukkit.block.ShulkerBox;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BlockStateMeta; import org.bukkit.inventory.meta.BlockStateMeta;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
@@ -172,7 +173,12 @@ public class TalismanChecks {
List<ItemStack> rawContents = new ArrayList<>(Arrays.asList(player.getInventory().getContents())); List<ItemStack> rawContents = new ArrayList<>(Arrays.asList(player.getInventory().getContents()));
if (readEnderChest) { if (readEnderChest) {
rawContents.addAll(Arrays.asList(player.getEnderChest().getContents())); Inventory enderChest = player.getEnderChest();
// Not always true, bug reported where it was null.
if (enderChest != null) {
rawContents.addAll(Arrays.asList(enderChest.getContents()));
}
} }
if (offhandOnly) { if (offhandOnly) {