Fixes for OctopusForm

• Fixed OctopusForm leaving smoke trails
• OctopusForm cooldown now applied when it starts forming, not when you
select a source
This commit is contained in:
StrangeOne101 2016-03-31 20:04:04 +13:00
parent 1a482cf6dd
commit e16ccecf3f

View file

@ -58,8 +58,8 @@ public class OctopusForm extends WaterAbility {
if (oldOctopus.formed) { if (oldOctopus.formed) {
oldOctopus.attack(); oldOctopus.attack();
return; return;
} else if (!oldOctopus.sourceSelected) { } else if (oldOctopus.sourceSelected) {
return; oldOctopus.remove();
} }
} }
@ -92,7 +92,6 @@ public class OctopusForm extends WaterAbility {
sourceLocation = sourceBlock.getLocation(); sourceLocation = sourceBlock.getLocation();
sourceSelected = true; sourceSelected = true;
start(); start();
bPlayer.addCooldown(this);
} }
} }
@ -100,6 +99,7 @@ public class OctopusForm extends WaterAbility {
if (sourceSelected) { if (sourceSelected) {
sourceSelected = false; sourceSelected = false;
settingUp = true; settingUp = true;
bPlayer.addCooldown(this);
} else if (settingUp) { } else if (settingUp) {
settingUp = false; settingUp = false;
forming = true; forming = true;