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

Fix catapult cooldown and adds cobblestone to default earthblocks list

Browse source
This commit is contained in:
BuildTools 2016-05-01 07:03:35 +01:00
parent b8a2b34289
commit 8ee81c9c0e
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -340,6 +340,7 @@ public class ConfigManager {
earthBlocks.add("DIAMOND_ORE"); earthBlocks.add("DIAMOND_ORE");
earthBlocks.add("NETHERRACK"); earthBlocks.add("NETHERRACK");
earthBlocks.add("QUARTZ_ORE"); earthBlocks.add("QUARTZ_ORE");
earthBlocks.add("COBBLESTONE");
ArrayList<String> metalBlocks = new ArrayList<String>(); ArrayList<String> metalBlocks = new ArrayList<String>();
metalBlocks.add("IRON_BLOCK"); metalBlocks.add("IRON_BLOCK");
@ -793,6 +794,7 @@ public class ConfigManager {
config.addDefault("Abilities.Earth.Catapult.Length", 6); config.addDefault("Abilities.Earth.Catapult.Length", 6);
config.addDefault("Abilities.Earth.Catapult.Push", 4); config.addDefault("Abilities.Earth.Catapult.Push", 4);
config.addDefault("Abilities.Earth.Catapult.ShiftModifier", 2); config.addDefault("Abilities.Earth.Catapult.ShiftModifier", 2);
config.addDefault("Abilities.Earth.Catapult.Cooldown", 1500);
config.addDefault("Abilities.Earth.Collapse.Enabled", true); config.addDefault("Abilities.Earth.Collapse.Enabled", true);
config.addDefault("Abilities.Earth.Collapse.SelectRange", 20); config.addDefault("Abilities.Earth.Collapse.SelectRange", 20);

2
src/com/projectkorra/projectkorra/earthbending/Catapult.java
View file

@ -81,7 +81,7 @@ public class Catapult extends EarthAbility {
this.push = getConfig().getDouble("Abilities.Earth.Catapult.Push"); this.push = getConfig().getDouble("Abilities.Earth.Catapult.Push");
this.shiftModifier = getConfig().getDouble("Abilities.Earth.Catapult.ShiftModifier"); this.shiftModifier = getConfig().getDouble("Abilities.Earth.Catapult.ShiftModifier");
this.distance = 0; this.distance = 0;
this.cooldown = 0; this.cooldown = getConfig().getLong("Abilities.Earth.Catapult.Cooldown");
this.catapult = false; this.catapult = false;
this.moving = false; this.moving = false;
this.flying = false; this.flying = false;