TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

add config option for gliding firejet, and make default false and change airscooter sitting default to false

Browse source
This commit is contained in:
PhanaticD 2019-01-18 22:29:20 -05:00
parent 11227a981a
commit 593d3225ff
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -1672,9 +1672,10 @@ public class PKListener implements Listener {
return; return;
} }
} }
if (ConfigManager.getConfig().getBoolean("Abilities.Fire.FireJet.ShowGliding")) {
if (CoreAbility.getAbility(player, FireJet.class) != null) { if (CoreAbility.getAbility(player, FireJet.class) != null) {
event.setCancelled(true); event.setCancelled(true);
}
} }
} }

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

@ -817,7 +817,7 @@ public class ConfigManager {
config.addDefault("Abilities.Air.AirBurst.AngleTheta", 10); config.addDefault("Abilities.Air.AirBurst.AngleTheta", 10);
config.addDefault("Abilities.Air.AirScooter.Enabled", true); config.addDefault("Abilities.Air.AirScooter.Enabled", true);
config.addDefault("Abilities.Air.AirScooter.ShowSitting", true); config.addDefault("Abilities.Air.AirScooter.ShowSitting", false);
config.addDefault("Abilities.Air.AirScooter.Speed", 0.675); config.addDefault("Abilities.Air.AirScooter.Speed", 0.675);
config.addDefault("Abilities.Air.AirScooter.Interval", 100); config.addDefault("Abilities.Air.AirScooter.Interval", 100);
config.addDefault("Abilities.Air.AirScooter.Radius", 1); config.addDefault("Abilities.Air.AirScooter.Radius", 1);
@ -1363,6 +1363,7 @@ public class ConfigManager {
config.addDefault("Abilities.Fire.FireJet.Speed", 0.8); config.addDefault("Abilities.Fire.FireJet.Speed", 0.8);
config.addDefault("Abilities.Fire.FireJet.Duration", 2000); config.addDefault("Abilities.Fire.FireJet.Duration", 2000);
config.addDefault("Abilities.Fire.FireJet.Cooldown", 7000); config.addDefault("Abilities.Fire.FireJet.Cooldown", 7000);
config.addDefault("Abilities.Fire.FireJet.ShowGliding", false);
config.addDefault("Abilities.Fire.FireManipulation.Enabled", false); config.addDefault("Abilities.Fire.FireManipulation.Enabled", false);

12
src/com/projectkorra/projectkorra/firebending/FireJet.java
View file

@ -28,6 +28,7 @@ public class FireJet extends FireAbility {
private double speed; private double speed;
private Random random; private Random random;
private Boolean previousGlidingState; private Boolean previousGlidingState;
private Boolean showGliding;
public FireJet(final Player player) { public FireJet(final Player player) {
super(player); super(player);
@ -49,6 +50,7 @@ public class FireJet extends FireAbility {
this.duration = getConfig().getLong("Abilities.Fire.FireJet.Duration"); this.duration = getConfig().getLong("Abilities.Fire.FireJet.Duration");
this.speed = getConfig().getDouble("Abilities.Fire.FireJet.Speed"); this.speed = getConfig().getDouble("Abilities.Fire.FireJet.Speed");
this.cooldown = getConfig().getLong("Abilities.Fire.FireJet.Cooldown"); this.cooldown = getConfig().getLong("Abilities.Fire.FireJet.Cooldown");
this.showGliding = getConfig().getBoolean("Abilities.Fire.FireJet.ShowGliding");
this.random = new Random(); this.random = new Random();
this.speed = this.getDayFactor(this.speed); this.speed = this.getDayFactor(this.speed);
@ -80,8 +82,10 @@ public class FireJet extends FireAbility {
this.time = System.currentTimeMillis(); this.time = System.currentTimeMillis();
this.start(); this.start();
previousGlidingState = player.isGliding(); if (showGliding) {
player.setGliding(true); previousGlidingState = player.isGliding();
player.setGliding(true);
}
this.bPlayer.addCooldown(this); this.bPlayer.addCooldown(this);
} }
} }
@ -118,7 +122,9 @@ public class FireJet extends FireAbility {
@Override @Override
public void remove() { public void remove() {
super.remove(); super.remove();
this.player.setGliding(previousGlidingState); if (showGliding) {
this.player.setGliding(previousGlidingState);
}
flightHandler.removeInstance(this.player, this.getName()); flightHandler.removeInstance(this.player, this.getName());
this.player.setFallDistance(0); this.player.setFallDistance(0);
} }