Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 30b4091

Browse files
committed
Update ProjectAddons.java
1 parent cc10a21 commit 30b4091

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/me/simplicitee/project/addons/ProjectAddons.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,11 @@ private void setupConfig() {
276276
c.addDefault("Abilities.Fire.CombustBeam.Minimum.Power", 0.6);
277277
c.addDefault("Abilities.Fire.CombustBeam.Minimum.Angle", 0.2);
278278
c.addDefault("Abilities.Fire.CombustBeam.Minimum.ChargeTime", 1000);
279+
c.addDefault("Abilities.Fire.CombustBeam.Minimum.Damage", 2);
279280
c.addDefault("Abilities.Fire.CombustBeam.Maximum.Power", 2.7);
280281
c.addDefault("Abilities.Fire.CombustBeam.Maximum.Angle", 40);
281282
c.addDefault("Abilities.Fire.CombustBeam.Maximum.ChargeTime", 5000);
283+
c.addDefault("Abilities.Fire.CombustBeam.Maximum.Damage", 10);
282284
c.addDefault("Abilities.Fire.CombustBeam.InterruptedDamage", 10);
283285
c.addDefault("Abilities.Fire.CombustBeam.RevertTime", 13000);
284286

src/me/simplicitee/project/addons/ability/chi/NinjaStance.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6-
import javax.swing.event.DocumentEvent.ElementChange;
7-
86
import org.bukkit.Location;
97
import org.bukkit.Sound;
108
import org.bukkit.entity.Player;
@@ -32,6 +30,11 @@ public class NinjaStance extends ChiAbility implements AddonAbility{
3230

3331
public NinjaStance(Player player) {
3432
super(player);
33+
34+
if (bPlayer.isOnCooldown(this)) {
35+
return;
36+
}
37+
3538
ChiAbility stance = bPlayer.getStance();
3639
if (stance != null) {
3740
stance.remove();
@@ -113,6 +116,12 @@ public void progress() {
113116
player.addPotionEffects(effects);
114117
}
115118

119+
@Override
120+
public void remove() {
121+
super.remove();
122+
bPlayer.addCooldown(this);
123+
}
124+
116125
@Override
117126
public String getAuthor() {
118127
return "Simplicitee";

0 commit comments

Comments
 (0)