Fix combustion charging particles

PrimordialMoros · Apr 20, 2021 · 1ff6d7c · 1ff6d7c
1 parent 798f8f1
commit 1ff6d7c
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/src/main/java/me/moros/hyperion/abilities/firebending/Combustion.java b/src/main/java/me/moros/hyperion/abilities/firebending/Combustion.java
@@ -129,24 +129,26 @@ public void progress() {
 				remove();
 				return;
 			}
-			if (!charged) {
-				if (System.currentTimeMillis() > getStartTime() + chargeTime) {
-					charged = true;
-				}
-			} else {
-				if (player.getHealth() + 0.5 < initialHealth) {
-					createExplosion(player.getEyeLocation(), power + misfireModifier, damage + misfireModifier);
-					return;
-				}
-				if (player.isSneaking() && chargeTime != 0) {
-					playParticleRing();
+			location = player.getEyeLocation();
+			if (chargeTime != 0) {
+				playParticleRing();
+				if (charged) {
 					CoreMethods.playFocusParticles(player);
 				} else {
-					bPlayer.addCooldown(this);
-					location = player.getEyeLocation();
-					launched = true;
+					if (System.currentTimeMillis() > getStartTime() + chargeTime) {
+						charged = true;
+					}
 				}
 			}
+			if (player.getHealth() + 0.5 < initialHealth) {
+				createExplosion(player.getEyeLocation(), power + misfireModifier, damage + misfireModifier);
+				return;
+			}
+
+			if (charged && (!player.isSneaking() || chargeTime <= 0)) {
+				bPlayer.addCooldown(this);
+				launched = true;
+			}
 		}
 	}