TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-09-11 04:39:32 +00:00
Code Issues Projects Releases Wiki Activity

Bug fixes (#642)

Browse source 
* Bug fixes

* Adjusted CollisionRadius

* Fixed AirSwipe scrolling
This commit is contained in:
Sobki 2016-11-03 10:46:56 +10:00 committed by Christopher Martin
parent a3655a6596
commit b96d41e554
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/airbending/AirSwipe.java
View file

@ -258,7 +258,7 @@ public class AirSwipe extends AirAbility {
} }
public void progress() { public void progress() {
if (!bPlayer.canBendIgnoreCooldowns(this)) { if (!bPlayer.canBendIgnoreBindsCooldowns(this)) {
remove(); remove();
return; return;
} }

10
src/com/projectkorra/projectkorra/configuration/ConfigManager.java
View file

@ -631,7 +631,7 @@ public class ConfigManager {
config.addDefault("Abilities.Water.IceBlast.Damage", 3); config.addDefault("Abilities.Water.IceBlast.Damage", 3);
config.addDefault("Abilities.Water.IceBlast.Range", 20); config.addDefault("Abilities.Water.IceBlast.Range", 20);
config.addDefault("Abilities.Water.IceBlast.DeflectRange", 3); config.addDefault("Abilities.Water.IceBlast.DeflectRange", 3);
config.addDefault("Abilities.Water.IceBlast.CollisionRadius", 0.5); config.addDefault("Abilities.Water.IceBlast.CollisionRadius", 1.5);
config.addDefault("Abilities.Water.IceBlast.Interval", 20); config.addDefault("Abilities.Water.IceBlast.Interval", 20);
config.addDefault("Abilities.Water.IceBlast.Cooldown", 1500); config.addDefault("Abilities.Water.IceBlast.Cooldown", 1500);
@ -651,7 +651,7 @@ public class ConfigManager {
config.addDefault("Abilities.Water.IceSpike.Field.Cooldown", 2000); config.addDefault("Abilities.Water.IceSpike.Field.Cooldown", 2000);
config.addDefault("Abilities.Water.IceSpike.Blast.Range", 20); config.addDefault("Abilities.Water.IceSpike.Blast.Range", 20);
config.addDefault("Abilities.Water.IceSpike.Blast.Damage", 1); config.addDefault("Abilities.Water.IceSpike.Blast.Damage", 1);
config.addDefault("Abilities.Water.IceSpike.Blast.CollisionRadius", 0.5); config.addDefault("Abilities.Water.IceSpike.Blast.CollisionRadius", 1.5);
config.addDefault("Abilities.Water.IceSpike.Blast.DeflectRange", 3); config.addDefault("Abilities.Water.IceSpike.Blast.DeflectRange", 3);
config.addDefault("Abilities.Water.IceSpike.Blast.Cooldown", 500); config.addDefault("Abilities.Water.IceSpike.Blast.Cooldown", 500);
config.addDefault("Abilities.Water.IceSpike.Blast.SlowCooldown", 5000); config.addDefault("Abilities.Water.IceSpike.Blast.SlowCooldown", 5000);
@ -776,7 +776,7 @@ public class ConfigManager {
config.addDefault("Abilities.Water.WaterManipulation.Damage", 3.0); config.addDefault("Abilities.Water.WaterManipulation.Damage", 3.0);
config.addDefault("Abilities.Water.WaterManipulation.Range", 25); config.addDefault("Abilities.Water.WaterManipulation.Range", 25);
config.addDefault("Abilities.Water.WaterManipulation.SelectRange", 16); config.addDefault("Abilities.Water.WaterManipulation.SelectRange", 16);
config.addDefault("Abilities.Water.WaterManipulation.CollisionRadius", 0.5); config.addDefault("Abilities.Water.WaterManipulation.CollisionRadius", 1.5);
config.addDefault("Abilities.Water.WaterManipulation.DeflectRange", 3); config.addDefault("Abilities.Water.WaterManipulation.DeflectRange", 3);
config.addDefault("Abilities.Water.WaterManipulation.Speed", 35); config.addDefault("Abilities.Water.WaterManipulation.Speed", 35);
config.addDefault("Abilities.Water.WaterManipulation.Push", 0.3); config.addDefault("Abilities.Water.WaterManipulation.Push", 0.3);
@ -845,7 +845,7 @@ public class ConfigManager {
config.addDefault("Abilities.Earth.EarthBlast.Push", 0.3); config.addDefault("Abilities.Earth.EarthBlast.Push", 0.3);
config.addDefault("Abilities.Earth.EarthBlast.Cooldown", 500); config.addDefault("Abilities.Earth.EarthBlast.Cooldown", 500);
config.addDefault("Abilities.Earth.EarthBlast.DeflectRange", 3); config.addDefault("Abilities.Earth.EarthBlast.DeflectRange", 3);
config.addDefault("Abilities.Earth.EarthBlast.CollisionRadius", 0.5); config.addDefault("Abilities.Earth.EarthBlast.CollisionRadius", 1.5);
config.addDefault("Abilities.Earth.EarthGrab.Enabled", true); config.addDefault("Abilities.Earth.EarthGrab.Enabled", true);
config.addDefault("Abilities.Earth.EarthGrab.SelectRange", 20); config.addDefault("Abilities.Earth.EarthGrab.SelectRange", 20);
@ -975,7 +975,7 @@ public class ConfigManager {
config.addDefault("Abilities.Fire.FireBlast.Enabled", true); config.addDefault("Abilities.Fire.FireBlast.Enabled", true);
config.addDefault("Abilities.Fire.FireBlast.Speed", 20); config.addDefault("Abilities.Fire.FireBlast.Speed", 20);
config.addDefault("Abilities.Fire.FireBlast.Range", 20); config.addDefault("Abilities.Fire.FireBlast.Range", 20);
config.addDefault("Abilities.Fire.FireBlast.CollisionRadius", 0.5); config.addDefault("Abilities.Fire.FireBlast.CollisionRadius", 1.5);
config.addDefault("Abilities.Fire.FireBlast.Push", 0.3); config.addDefault("Abilities.Fire.FireBlast.Push", 0.3);
config.addDefault("Abilities.Fire.FireBlast.Damage", 3); config.addDefault("Abilities.Fire.FireBlast.Damage", 3);
config.addDefault("Abilities.Fire.FireBlast.Cooldown", 1500); config.addDefault("Abilities.Fire.FireBlast.Cooldown", 1500);

2
src/com/projectkorra/projectkorra/firebending/FireBlast.java
View file

@ -158,7 +158,7 @@ public class FireBlast extends FireAbility {
@Override @Override
public void progress() { public void progress() {
if (!bPlayer.canBendIgnoreCooldowns(this) if (!bPlayer.canBendIgnoreBindsCooldowns(this)
|| GeneralMethods.isRegionProtectedFromBuild(this, location)) { || GeneralMethods.isRegionProtectedFromBuild(this, location)) {
remove(); remove();
return; return;

2
src/com/projectkorra/projectkorra/waterbending/HealingWaters.java
View file

@ -208,7 +208,7 @@ public class HealingWaters extends HealingAbility {
private void applyHealing(LivingEntity livingEntity) { private void applyHealing(LivingEntity livingEntity) {
if (livingEntity.getHealth() < livingEntity.getMaxHealth()) { if (livingEntity.getHealth() < livingEntity.getMaxHealth()) {
livingEntity.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, duration, 1)); livingEntity.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, duration, power));
AirAbility.breakBreathbendingHold(livingEntity); AirAbility.breakBreathbendingHold(livingEntity);
healing = true; healing = true;
healingSelf = false; healingSelf = false;