TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #266 from jacklin213/master

Browse source 
[Urgent] Change RevertChecker Sets back into Maps
This commit is contained in:
OmniCypher 2015-10-05 19:05:54 -07:00
commit 7729e2e9b4
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/com/projectkorra/projectkorra/util/RevertChecker.java
View file

@ -12,10 +12,9 @@ import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future;
public class RevertChecker implements Runnable {
@ -24,8 +23,8 @@ public class RevertChecker implements Runnable {
private static final FileConfiguration config = ConfigManager.defaultConfig.get();
private static final boolean safeRevert = config.getBoolean("Properties.Earth.SafeRevert");
public static Set<Block> earthRevertQueue = new HashSet<>();
static Set<Integer> airRevertQueue = new HashSet<>();
public static Map<Block, Block> earthRevertQueue = new ConcurrentHashMap<>();
static Map<Integer, Integer> airRevertQueue = new ConcurrentHashMap<>();
//static ConcurrentHashMap<Chunk, Chunk> chunks = new ConcurrentHashMap<Chunk, Chunk>();
// static ConcurrentHashMap<Block, Material> movedEarthQueue = new ConcurrentHashMap<Block, Material>();
@ -36,14 +35,14 @@ public class RevertChecker implements Runnable {
}
public static void revertAirBlocks() {
for (int ID : airRevertQueue) {
for (int ID : airRevertQueue.keySet()) {
EarthMethods.revertAirBlock(ID);
RevertChecker.airRevertQueue.remove(ID);
}
}
public static void revertEarthBlocks() {
for (Block block : earthRevertQueue) {
for (Block block : earthRevertQueue.keySet()) {
EarthMethods.revertBlock(block);
earthRevertQueue.remove(block);
}
@ -58,14 +57,14 @@ public class RevertChecker implements Runnable {
// }
private void addToAirRevertQueue(int i) {
if (!airRevertQueue.contains(i))
airRevertQueue.add(i);
if (!airRevertQueue.containsKey(i))
airRevertQueue.put(i, i);
}
private void addToRevertQueue(Block block) {
if (!earthRevertQueue.contains(block))
earthRevertQueue.add(block);
if (!earthRevertQueue.containsKey(block))
earthRevertQueue.put(block, block);
}
public void run() {
@ -81,7 +80,7 @@ public class RevertChecker implements Runnable {
earth.putAll(EarthMethods.movedearth);
for (Block block : earth.keySet()) {
if (earthRevertQueue.contains(block))
if (earthRevertQueue.containsKey(block))
continue;
boolean remove = true;
Information info = earth.get(block);
@ -97,7 +96,7 @@ public class RevertChecker implements Runnable {
air.putAll(EarthMethods.tempair);
for (Integer i : air.keySet()) {
if (airRevertQueue.contains(i))
if (airRevertQueue.containsKey(i))
continue;
boolean remove = true;
Information info = air.get(i);