Fix Charged FireBlast radius and cooldown (#1019)

## Fixes
* Fixes Charged FireBlast radius being too big
* Fixes Charged FireBlast cooldown happening without using the ability
This commit is contained in:
Benford Whitaker 2019-08-31 22:42:32 -04:00 committed by Christopher Martin
parent 34fa6d08b8
commit c4be31c3b9

View file

@ -216,7 +216,7 @@ public class FireBlastCharged extends FireAbility {
}
boolean exploded = false;
for (final Entity entity : GeneralMethods.getEntitiesAroundPoint(this.location, 2 * this.collisionRadius)) {
for (final Entity entity : GeneralMethods.getEntitiesAroundPoint(this.location, this.collisionRadius)) {
if (entity.getEntityId() == this.player.getEntityId() || GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation())) {
continue;
}
@ -310,7 +310,9 @@ public class FireBlastCharged extends FireAbility {
@Override
public void remove() {
super.remove();
this.bPlayer.addCooldown(this);
if (this.charged) {
this.bPlayer.addCooldown(this);
}
}
@Override