TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-11-01 01:42:18 +00:00
Code Issues Projects Releases Wiki Activity

Generi-size PhaseChangeFreeze (#594)

Browse source 
* Generi-size PhaseChangeFreeze

Make the ConcurrentHashMap in PhaseChangeFreeze Generic to allow for Java 7 / Java 8 compatibility.

* Add missing import to PhaseChangeFreeze

* Update PhaseChangeFreeze accessor
This commit is contained in:
Christopher Martin 2016-10-09 12:01:38 -07:00 committed by GitHub
parent fad2f5542b
commit 2b3ae10c2b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/com/projectkorra/projectkorra/waterbending/PhaseChangeFreeze.java
View file

@ -13,11 +13,12 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
public class PhaseChangeFreeze extends IceAbility { public class PhaseChangeFreeze extends IceAbility {
private static final ConcurrentHashMap<Block, Byte> FROZEN_BLOCKS = new ConcurrentHashMap<>(); private static final Map<Block, Byte> FROZEN_BLOCKS = new ConcurrentHashMap<>();
private static final double REMOVE_RANGE = 50; // TODO: Make the remove range non static private static final double REMOVE_RANGE = 50; // TODO: Make the remove range non static
private static boolean overloading = false; private static boolean overloading = false;
@ -241,7 +242,7 @@ public class PhaseChangeFreeze extends IceAbility {
this.radius = radius; this.radius = radius;
} }
public static ConcurrentHashMap<Block, Byte> getFrozenBlocks() { public static Map<Block, Byte> getFrozenBlocks() {
return FROZEN_BLOCKS; return FROZEN_BLOCKS;
} }