Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-03-24 04:30:04 +01:00
Code Issues Projects Releases Wiki Activity

Fix item requirements NPE

Browse Source
This commit is contained in:
Daniel Saukel 2018-08-11 18:11:08 +02:00
parent c94d2946ac
commit f29c6ed182
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/de/erethon/dungeonsxl/requirement/ForbiddenItemsRequirement.java
View File

@ -56,6 +56,9 @@ public class ForbiddenItemsRequirement extends Requirement {
@Override
public boolean check(Player player) {
for (ItemStack item : player.getInventory().getStorageContents()) {
if (item == null) {
continue;
}
ExItem exItem = caliburn.getExItem(item);
if (forbiddenItems.contains(exItem)) {
return false;

3
src/main/java/de/erethon/dungeonsxl/requirement/KeyItemsRequirement.java
View File

@ -58,6 +58,9 @@ public class KeyItemsRequirement extends Requirement {
public boolean check(Player player) {
List<ExItem> keyItems = new ArrayList<>(this.keyItems);
for (ItemStack item : player.getInventory().getStorageContents()) {
if (item == null) {
continue;
}
keyItems.remove(caliburn.getExItem(item));
}
return keyItems.isEmpty();