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

Merge pull request #470 from Simplicitee/master

Browse source 
Add de-avatar
This commit is contained in:
OmniCypher 2016-04-05 18:13:50 -07:00
commit 43433b060c
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
lib/ProjectKorraRPG.jar
View file

Binary file not shown.

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

@ -58,6 +58,7 @@ import com.projectkorra.projectkorra.earthbending.Tremorsense;
import com.projectkorra.projectkorra.event.EntityBendingDeathEvent;
import com.projectkorra.projectkorra.event.HorizontalVelocityChangeEvent;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent.Result;
import com.projectkorra.projectkorra.firebending.Blaze;
import com.projectkorra.projectkorra.firebending.BlazeArc;
import com.projectkorra.projectkorra.firebending.BlazeRing;
@ -96,6 +97,7 @@ import com.projectkorra.projectkorra.waterbending.WaterManipulation;
import com.projectkorra.projectkorra.waterbending.WaterPassive;
import com.projectkorra.projectkorra.waterbending.WaterSpout;
import com.projectkorra.projectkorra.waterbending.WaterSpoutWave;
import com.projectkorra.rpg.RPGMethods;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
@ -315,26 +317,32 @@ public class PKListener implements Listener {
public void onElementChange(PlayerChangeElementEvent event) {
Player player = event.getTarget();
BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player);
Element element = event.getElement();
String prefix = "";
if (bPlayer == null) {
return;
}
boolean chatEnabled = ConfigManager.languageConfig.get().getBoolean("Chat.Enable");
if (bPlayer.getElements().size() > 1) {
prefix = Element.AVATAR.getPrefix();
} else if (element != null){
prefix = element.getPrefix();
} else {
prefix = ChatColor.WHITE + "[Nonbender] ";
}
if (chatEnabled) {
if (chatEnabled) {
Element element = event.getElement();
String prefix = "";
if (bPlayer == null) {
return;
}
if (bPlayer.getElements().size() > 1) {
prefix = Element.AVATAR.getPrefix();
} else if (element != null){
prefix = element.getPrefix();
} else {
prefix = ChatColor.WHITE + "[Nonbender] ";
}
player.setDisplayName(player.getName());
player.setDisplayName(prefix + ChatColor.RESET + player.getDisplayName());
}
if (event.getResult() == Result.REMOVE) {
if (GeneralMethods.hasRPG()) {
RPGMethods.revokeAvatar(player.getUniqueId());
}
}
}
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)