EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-27 01:25:27 +02:00
Code Issues Projects Releases Wiki Activity

Remove explosion from rupture, and rupture bug fixes and other tweaks

Browse Source
This commit is contained in:
nossr50
2021-04-23 11:13:59 -07:00
parent d67c561fed
commit f983f95961
8 changed files with 57 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/gmail/nossr50/runnables/skills/RuptureTask.java
View File

@@ -7,13 +7,13 @@ import com.gmail.nossr50.util.skills.ParticleEffectUtils;
import com.google.common.base.Objects;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.NotNull;
public class RuptureTask extends BukkitRunnable {
public static final int DAMAGE_TICK_INTERVAL = 10;
public static final int ANIMATION_TICK_INTERVAL = 2;
private final @NotNull McMMOPlayer ruptureSource;
private final @NotNull LivingEntity targetEntity;
@@ -21,8 +21,9 @@ public class RuptureTask extends BukkitRunnable {
private int ruptureTick;
private int damageTickTracker;
private final double pureTickDamage; //TODO: Make configurable
private final double explosionDamage; //TODO: Make configurable
private int animationTick;
private final double pureTickDamage;
private final double explosionDamage;
public RuptureTask(@NotNull McMMOPlayer ruptureSource, @NotNull LivingEntity targetEntity, double pureTickDamage, double explosionDamage) {
this.ruptureSource = ruptureSource;
@@ -31,6 +32,7 @@ public class RuptureTask extends BukkitRunnable {
this.ruptureTick = 0;
this.damageTickTracker = 0;
this.animationTick = ANIMATION_TICK_INTERVAL; //Play an animation right away
this.pureTickDamage = pureTickDamage;
this.explosionDamage = explosionDamage;
}
@@ -61,14 +63,20 @@ public class RuptureTask extends BukkitRunnable {
if (event.isCancelled() || damage <= 0 || healthBeforeRuptureIsApplied - damage <= 0)
return;
ParticleEffectUtils.playBleedEffect(targetEntity); //Animate
if(animationTick >= ANIMATION_TICK_INTERVAL) {
ParticleEffectUtils.playBleedEffect(targetEntity); //Animate
animationTick = 0;
} else {
animationTick++;
}
double damagedHealth = healthBeforeRuptureIsApplied - damage;
targetEntity.setHealth(damagedHealth); //Hurt entity without the unwanted side effects of damage()}
}
}
} else {
explode();
endRupture();
}
} else {
targetEntity.removeMetadata(mcMMO.RUPTURE_META_KEY, mcMMO.p);
@@ -81,18 +89,18 @@ public class RuptureTask extends BukkitRunnable {
ruptureTick = 0;
}
public void explode() {
targetEntity.setMetadata(mcMMO.EXPLOSION_FROM_RUPTURE, new FixedMetadataValue(mcMMO.p, "null"));
ParticleEffectUtils.playGreaterImpactEffect(targetEntity); //Animate
if(ruptureSource.getPlayer() != null && ruptureSource.getPlayer().isValid()) {
targetEntity.damage(getExplosionDamage(), ruptureSource.getPlayer());
} else {
targetEntity.damage(getExplosionDamage(), null);
}
targetEntity.removeMetadata(mcMMO.RUPTURE_META_KEY, mcMMO.p);
public void endRupture() {
// targetEntity.setMetadata(mcMMO.EXPLOSION_FROM_RUPTURE, new FixedMetadataValue(mcMMO.p, "null"));
//
// ParticleEffectUtils.playGreaterImpactEffect(targetEntity); //Animate
//
// if(ruptureSource.getPlayer() != null && ruptureSource.getPlayer().isValid()) {
// targetEntity.damage(getExplosionDamage(), ruptureSource.getPlayer());
// } else {
// targetEntity.damage(getExplosionDamage(), null);
// }
//
// targetEntity.removeMetadata(mcMMO.RUPTURE_META_KEY, mcMMO.p);
this.cancel(); //Task no longer needed
}