Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-11-26 12:16:18 +01:00
Code Issues Projects Releases Wiki Activity

fix rare double-crash + dead items

Browse Source
This commit is contained in:
jascotty2 2019-08-12 09:22:24 -05:00
parent 623c048f9c
commit 88f8d96b78
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/songoda/epichoppers/EpicHoppers.java
View File

@ -185,6 +185,10 @@ public class EpicHoppers extends JavaPlugin {
* Saves registered hoppers to file. * Saves registered hoppers to file.
*/ */
private void saveToFile() { private void saveToFile() {
// double-check that we're ok to save
if(EpicHoppers.getInstance().getLevelManager() == null)
return;
checkStorage(); checkStorage();
for (Level level : EpicHoppers.getInstance().getLevelManager().getLevels().values()) for (Level level : EpicHoppers.getInstance().getLevelManager().getLevels().values())

2
src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java
View File

@ -48,6 +48,7 @@ public class ModuleSuction extends Module {
Set<Item> itemsToSuck = hopper.getLocation().getWorld().getNearbyEntities(hopper.getLocation().add(0.5, 0.5, 0.5), radius, radius, radius) Set<Item> itemsToSuck = hopper.getLocation().getWorld().getNearbyEntities(hopper.getLocation().add(0.5, 0.5, 0.5), radius, radius, radius)
.stream() .stream()
.filter(entity -> entity.getType() == EntityType.DROPPED_ITEM .filter(entity -> entity.getType() == EntityType.DROPPED_ITEM
&& !entity.isDead()
&& entity.getTicksLived() >= ((Item) entity).getPickupDelay() && entity.getTicksLived() >= ((Item) entity).getPickupDelay()
&& entity.getLocation().getBlock().getType() != Material.HOPPER) && entity.getLocation().getBlock().getType() != Material.HOPPER)
.map(entity -> (Item) entity) .map(entity -> (Item) entity)
@ -56,6 +57,7 @@ public class ModuleSuction extends Module {
boolean filterEndpoint = hopper.getFilter().getEndPoint() != null; boolean filterEndpoint = hopper.getFilter().getEndPoint() != null;
for (Item item : itemsToSuck) { for (Item item : itemsToSuck) {
ItemStack itemStack = item.getItemStack(); ItemStack itemStack = item.getItemStack();
if (item.getPickupDelay() == 0) { if (item.getPickupDelay() == 0) {