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

Merge branch 'master' of https://github.com/ProjectKorra/ProjectKorra

Browse source 
Conflicts:
	.classpath
This commit is contained in:
MistPhizzle 2014-06-13 16:01:05 -04:00
commit b2f7e00083
3 changed files with 54 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.classpath
View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
@ -5,3 +6,13 @@
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/BukkitForPlugins.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
=======
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
<classpathentry kind="lib" path="C:/Users/PhilipStephenson/Desktop/MineScape test server/craftbukkit-1.7.2-R0.3-20140131.210753-26.jar"/>
<classpathentry kind="lib" path="C:/Users/PhilipStephenson/Downloads/TagAPI.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
>>>>>>> 44624cd18ebcbb8b5c2a56bf36e9d5c6a8974795

35
src/com/projectkorra/ProjectKorra/PKListener.java
View file

@ -1,5 +1,8 @@
package com.projectkorra.ProjectKorra;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
@ -15,6 +18,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.kitteh.tag.AsyncPlayerReceiveNameTagEvent;
import com.projectkorra.ProjectKorra.chiblocking.ChiPassive;
import com.projectkorra.ProjectKorra.earthbending.EarthPassive;
@ -33,6 +37,22 @@ public class PKListener implements Listener {
@EventHandler
public void onPlayerJoin(PlayerJoinEvent e) {
Methods.createBendingPlayer(e.getPlayer().getUniqueId(), e.getPlayer().getName());
Player player = e.getPlayer();
List<Element> elements = Methods.getBendingPlayer(e.getPlayer().getName()).getElements();
if (plugin.getConfig().getBoolean("Properties.Chat.ChatPrefixes")) {
if (elements.size() > 1)
player.setDisplayName(plugin.getConfig().getString("Properties.Chat.AvatarPrefix") + player.getName());
else if (elements.get(0).equals(Element.Earth))
player.setDisplayName(plugin.getConfig().getString("Properties.Chat.EarthPrefix") + player.getName());
else if (elements.get(0).equals(Element.Air))
player.setDisplayName(plugin.getConfig().getString("Properties.Chat.AirPrefix") + player.getName());
else if (elements.get(0).equals(Element.Water))
player.setDisplayName(plugin.getConfig().getString("Properties.Chat.WaterPrefix") + player.getName());
else if (elements.get(0).equals(Element.Fire))
player.setDisplayName(plugin.getConfig().getString("Properties.Chat.FirePrefix") + player.getName());
else if (elements.get(0).equals(Element.Chi))
player.setDisplayName(plugin.getConfig().getString("Properties.Chat.ChiPrefix") + player.getName());
}
}
@EventHandler
@ -125,4 +145,19 @@ public class PKListener implements Listener {
}
}
public void onNameTag(AsyncPlayerReceiveNameTagEvent e) {
List<Element> elements = Methods.getBendingPlayer(e.getNamedPlayer().getName()).getElements();
if (elements.size() > 1)
e.setTag(ChatColor.LIGHT_PURPLE + e.getNamedPlayer().getName());
else if (elements.get(0).equals(Element.Earth))
e.setTag(ChatColor.GREEN + e.getNamedPlayer().getName());
else if (elements.get(0).equals(Element.Air))
e.setTag(ChatColor.GRAY + e.getNamedPlayer().getName());
else if (elements.get(0).equals(Element.Water))
e.setTag(ChatColor.AQUA + e.getNamedPlayer().getName());
else if (elements.get(0).equals(Element.Fire))
e.setTag(ChatColor.RED + e.getNamedPlayer().getName());
else if (elements.get(0).equals(Element.Chi))
e.setTag(ChatColor.GOLD + e.getNamedPlayer().getName());
}
}

8
src/config.yml
View file

@ -1,5 +1,13 @@
Properties:
GlobalCooldown: 500
Chat:
ChatPrefixes: true
AirPrefix: "[&7Air&f]"
WaterPrefix: "[&bWater&f]"
EarthPrefix: "[&aEarth&f]"
FirePrefix: "[&cFire&f]"
AvatarPrefix: "[&5Avatar&f]"
ChiPrefix: "[&6Chi]"
Air:
CanBendWithWeapons: false
Water: