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

Fix concurrentmodificationexception

Browse Source
This commit is contained in:
Esophose 2019-06-01 10:35:29 -06:00
parent 1475ff9467
commit cdef4b98ff
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/songoda/epichoppers/tasks/HopTask.java
View File

@ -2,6 +2,7 @@ package com.songoda.epichoppers.tasks;
import com.songoda.epichoppers.EpicHoppers; import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.boost.BoostData; import com.songoda.epichoppers.boost.BoostData;
import com.songoda.epichoppers.hopper.HopperManager;
import com.songoda.epichoppers.hopper.levels.modules.Module; import com.songoda.epichoppers.hopper.levels.modules.Module;
import com.songoda.epichoppers.utils.HopperDirection; import com.songoda.epichoppers.utils.HopperDirection;
import com.songoda.epichoppers.utils.Methods; import com.songoda.epichoppers.utils.Methods;
@ -11,7 +12,6 @@ import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.Particle;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
@ -31,9 +31,11 @@ import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
@ -61,6 +63,8 @@ public class HopTask extends BukkitRunnable {
Collection<com.songoda.epichoppers.hopper.Hopper> hoppers = plugin.getHopperManager().getHoppers().values(); Collection<com.songoda.epichoppers.hopper.Hopper> hoppers = plugin.getHopperManager().getHoppers().values();
Iterator<com.songoda.epichoppers.hopper.Hopper> itr = hoppers.iterator(); Iterator<com.songoda.epichoppers.hopper.Hopper> itr = hoppers.iterator();
Set<Location> toRemove = new HashSet<>();
main: main:
while (itr.hasNext()) { while (itr.hasNext()) {
com.songoda.epichoppers.hopper.Hopper hopper = itr.next(); com.songoda.epichoppers.hopper.Hopper hopper = itr.next();
@ -78,7 +82,7 @@ public class HopTask extends BukkitRunnable {
// If block is not a hopper remove and continue. // If block is not a hopper remove and continue.
if (block.getType() != Material.HOPPER) { if (block.getType() != Material.HOPPER) {
plugin.getHopperManager().removeHopper(location); toRemove.add(location);
continue; continue;
} }
@ -282,6 +286,10 @@ public class HopTask extends BukkitRunnable {
} }
} }
// Clear out invalid hoppers
HopperManager hopperManager = plugin.getHopperManager();
toRemove.forEach(hopperManager::removeHopper);
// Empty blacklist in preparation for next cycle. // Empty blacklist in preparation for next cycle.
this.blacklist.clear(); this.blacklist.clear();
} }