Fixed Fissure (#11)

* Fixed Fissure

- Fixed Fissure leaving a lava line in 1.11.0

* Fixed Lava immunity bug

- Fixed LavaFlux not giving lava damage

---------

Co-authored-by: Robbie Gorey <59033980+Aztlon@users.noreply.github.com>

Author: StrangeOne101

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.jedk1</groupId>
   <artifactId>jedcore</artifactId>
-  <version>2.12.2-Spigot1.16-PK1.10.2-BETA</version>
+  <version>2.12.2-Spigot1.18-PK1.11.0</version>
   <packaging>jar</packaging>
   <name>JedCore</name>
 
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.github.ProjectKorra</groupId>
       <artifactId>ProjectKorra</artifactId>
-      <version>v1.10.2</version>
+      <version>v1.11.1</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

src/com/jedk1/jedcore/ability/earthbending/Fissure.java

@@ -53,6 +53,7 @@ public class Fissure extends LavaAbility implements AddonAbility {
 
 	private final List<Location> centerSlap = new ArrayList<>();
 	private final List<Block> blocks = new ArrayList<>();
+	private final List<TempBlock> tempblocks = new ArrayList<>();
 
 	public Fissure(Player player) {
 		super(player);
@@ -157,7 +158,7 @@ private boolean prepareLine() {
 
 	private void slapCenter() {
 		for (Location location : centerSlap) {
-			if (centerSlap.indexOf(location) <= slap) {
+			if (centerSlap.indexOf(location) == slap) {
 				addTempBlock(location.getBlock(), Material.LAVA);
 			}
 		}
@@ -235,7 +236,7 @@ private void addTempBlock(Block block, Material material) {
 		if (DensityShift.isPassiveSand(block)) {
             DensityShift.revertSand(block);
 		}
-		new TempBlock(block, material.createBlockData());
+		tempblocks.add(new TempBlock(block, material.createBlockData(), this));
 		blocks.add(block);
 	}
 
@@ -263,17 +264,16 @@ public BlockFace getLeftBlockFace(BlockFace forward) {
 	}
 
 	private void forceRevert() {
-		for (Block block : blocks) {
-			new RegenTempBlock(block, Material.STONE, Material.STONE.createBlockData(), 500 + (long) rand.nextInt((int) 1000));
-		}
 		coolLava();
 	}
 
 	private void coolLava() {
+		tempblocks.forEach(TempBlock::revertBlock);
 		for (Block block : blocks) {
-			new RegenTempBlock(block, Material.STONE, Material.STONE.createBlockData(), 500 + (long) rand.nextInt((int) 1000));
+			new TempBlock(block, Material.STONE.createBlockData(), 500 + (long) rand.nextInt((int) 1000));
 		}
 		blocks.clear();
+		tempblocks.clear();
 	}
 
 	@Override

src/com/jedk1/jedcore/ability/earthbending/LavaFlux.java

@@ -176,7 +176,7 @@ private void progressFlux() {
 		for (Location location : flux) {
 			if (flux.indexOf(location) <= step) {
 				if (!blocks.containsKey(location.getBlock())) { //Make a new temp block if we haven't made one there before
-					blocks.put(location.getBlock(), new TempBlock(location.getBlock(), LAVA, duration + cleanup));
+					blocks.put(location.getBlock(), new TempBlock(location.getBlock(), LAVA, duration + cleanup, this));
 				}
 
 				//new RegenTempBlock(location.getBlock(), Material.LAVA, LAVA, duration + cleanup);
@@ -189,15 +189,15 @@ private void progressFlux() {
 					if (isPlant(above) || isSnow(above)) {
 						final Block above2 = above.getRelative(BlockFace.UP);
 						if (isPlant(above) || isSnow(above)) {
-							TempBlock tb = new TempBlock(above, Material.AIR.createBlockData(), duration + cleanup);
+							TempBlock tb = new TempBlock(above, Material.AIR.createBlockData(), duration + cleanup, this);
 							this.above.put(above, tb);
 							if (isPlant(above2) && above2.getBlockData() instanceof Bisected) {
-								TempBlock tb2 = new TempBlock(above2, Material.AIR.createBlockData(), duration + cleanup + 30_000);
+								TempBlock tb2 = new TempBlock(above2, Material.AIR.createBlockData(), duration + cleanup + 30_000, this);
 								tb.addAttachedBlock(tb2);
 							}
 						}
 					} else if (wave && isTransparent(above)) {
-						new TempBlock(location.getBlock().getRelative(BlockFace.UP), LAVA, speed * 150L);
+						new TempBlock(location.getBlock().getRelative(BlockFace.UP), LAVA, speed * 150L, this);
 					}
 				}
 			}