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

Fixed Disabled Abilities Loading

Browse source 
• Fixes disabled abilities still being able to be bound (some) and used
• Fixes Torrent flood issue with bottlebending
• Fixed Combos not being able to be disabled
This commit is contained in:
StrangeOne101 2016-06-12 16:47:00 +12:00
parent 6419ba6201
commit 4cad1dd5c3
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/projectkorra/projectkorra/BendingPlayer.java
View file

@ -248,7 +248,7 @@ public class BendingPlayer {
} }
public boolean canBind(CoreAbility ability) { public boolean canBind(CoreAbility ability) {
if (ability == null || !player.isOnline()) { if (ability == null || !player.isOnline() || !ability.isEnabled()) {
return false; return false;
} else if (!player.hasPermission("bending.ability." + ability.getName())) { } else if (!player.hasPermission("bending.ability." + ability.getName())) {
return false; return false;

2
src/com/projectkorra/projectkorra/GeneralMethods.java
View file

@ -384,7 +384,7 @@ public class GeneralMethods {
for (int i = 1; i <= 9; i++) { for (int i = 1; i <= 9; i++) {
String slot = rs2.getString("slot" + i); String slot = rs2.getString("slot" + i);
if (slot != null && !slot.equalsIgnoreCase("null")) { if (slot != null && !slot.equalsIgnoreCase("null") && CoreAbility.getAbility(slot) != null && CoreAbility.getAbility(slot).isEnabled()) {
abilities.put(i, slot); abilities.put(i, slot);
} }
} }

2
src/com/projectkorra/projectkorra/ability/CoreAbility.java
View file

@ -517,7 +517,7 @@ public abstract class CoreAbility implements Ability {
String tag = null; String tag = null;
if (this instanceof ComboAbility) { if (this instanceof ComboAbility) {
tag = "Abilities." + elementName + "." + elementName + "Combo" + ".Enabled"; tag = "Abilities." + elementName + "." + elementName + "Combo." + getName() + ".Enabled";
} else { } else {
tag = "Abilities." + elementName + "." + getName() + ".Enabled"; tag = "Abilities." + elementName + "." + getName() + ".Enabled";
} }

2
src/com/projectkorra/projectkorra/command/BindCommand.java
View file

@ -40,7 +40,7 @@ public class BindCommand extends PKCommand {
} }
CoreAbility coreAbil = CoreAbility.getAbility(args.get(0)); CoreAbility coreAbil = CoreAbility.getAbility(args.get(0));
if (coreAbil == null || coreAbil.isHiddenAbility()) { if (coreAbil == null || coreAbil.isHiddenAbility() || !coreAbil.isEnabled()) {
sender.sendMessage(ChatColor.RED + abilityDoesntExist); sender.sendMessage(ChatColor.RED + abilityDoesntExist);
return; return;
} }

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

@ -33,7 +33,7 @@ public class FireBlast extends FireAbility {
private boolean powerFurnace; private boolean powerFurnace;
private boolean showParticles; private boolean showParticles;
private boolean dissipate; private boolean dissipate;
private boolean isFireBurst; private boolean isFireBurst = false;
private int ticks; private int ticks;
private long cooldown; private long cooldown;
private double speedFactor; private double speedFactor;

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

@ -473,7 +473,7 @@ public class Torrent extends WaterAbility {
Block block = eyeLoc.add(eyeLoc.getDirection().normalize()).getBlock(); Block block = eyeLoc.add(eyeLoc.getDirection().normalize()).getBlock();
if (isTransparent(player, block) && isTransparent(player, eyeLoc.getBlock())) { if (isTransparent(player, block) && isTransparent(player, eyeLoc.getBlock())) {
block.setType(Material.WATER); block.setType(Material.WATER);
block.setData((byte) 0); block.setData((byte) 8);
Torrent tor = new Torrent(player); Torrent tor = new Torrent(player);
if (tor.sourceSelected || tor.settingUp) { if (tor.sourceSelected || tor.settingUp) {