TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-12 03:59:06 +00:00
Code Issues Projects Releases Wiki Activity

Add new CoreAbility API, Add BendingPlayer methods

Browse source
This commit is contained in:
Nathan Braun 2015-11-28 10:41:23 -08:00
parent e4fee98492
commit ba3881d856
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/com/projectkorra/projectkorra/ability/api/AirAbility.java
View file

@ -20,6 +20,14 @@ public abstract class AirAbility extends CoreAbility {
return "Air"; return "Air";
} }
<<<<<<< HEAD
=======
@Override
public final ChatColor getElementColor() {
return getAirColor();
}
>>>>>>> Add new CoreAbility API, Add BendingPlayer methods
/** /**
* Gets the AirColor from the config. * Gets the AirColor from the config.
* *

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

@ -1,6 +1,5 @@
package com.projectkorra.projectkorra.ability.api; package com.projectkorra.projectkorra.ability.api;
import com.projectkorra.projectkorra.SubElement;
import com.projectkorra.projectkorra.configuration.ConfigManager; import com.projectkorra.projectkorra.configuration.ConfigManager;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -98,7 +97,6 @@ public abstract class CoreAbility implements Ability {
if (playerMap.size() == 0) { if (playerMap.size() == 0) {
classMap.remove(playerMap); classMap.remove(playerMap);
} }
CoreAbility.instancesByClass.get(getClass()).remove(this); CoreAbility.instancesByClass.get(getClass()).remove(this);
} }