Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

allow blocks with no drop tables

Browse Source
This commit is contained in:
Indyuce 2022-01-30 13:00:30 +01:00
parent 584619070b
commit 333ecf93da
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/Indyuce/mmocore/api/block/BlockInfo.java
View File

@ -14,11 +14,9 @@ import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
public class BlockInfo { public class BlockInfo {
@ -78,18 +76,19 @@ public class BlockInfo {
return block; return block;
} }
@NotNull
public DropTable getDropTable() { public DropTable getDropTable() {
return table; return Objects.requireNonNull(table, "Block has no drop table");
}
public List<ItemStack> collectDrops(LootBuilder builder) {
return hasDropTable() ? table.collect(builder) : new ArrayList<>();
} }
public boolean hasDropTable() { public boolean hasDropTable() {
return table != null; return table != null;
} }
public List<ItemStack> collectDrops(LootBuilder builder) {
return table != null ? table.collect(builder) : new ArrayList<>();
}
public boolean hasRegen() { public boolean hasRegen() {
return regen != null; return regen != null;
} }

2
src/main/java/net/Indyuce/mmocore/listener/BlockListener.java
View File

@ -85,7 +85,7 @@ public class BlockListener implements Listener {
* Find the block drops * Find the block drops
*/ */
boolean conditionsMet = !info.hasDropTable() || info.getDropTable().areConditionsMet(new ConditionInstance(player)); boolean conditionsMet = !info.hasDropTable() || info.getDropTable().areConditionsMet(new ConditionInstance(player));
List<ItemStack> drops = conditionsMet ? info.getDropTable().collect(new LootBuilder(PlayerData.get(player), 0)) : new ArrayList<>(); List<ItemStack> drops = conditionsMet && info.hasDropTable() ? info.getDropTable().collect(new LootBuilder(PlayerData.get(player), 0)) : new ArrayList<>();
/* /*
* Calls the event and listen for cancel & for drops changes... also * Calls the event and listen for cancel & for drops changes... also