EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed prefixes again

Browse Source
This commit is contained in:
cerevisiae 2010-12-01 00:47:58 -06:00
parent 39d48a3bb7
commit b2c33b779d
2 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
vMinecraftChat.java
View File

@ -79,7 +79,7 @@ public class vMinecraftChat {
//and their following color codes //and their following color codes
for(int x = 0; x<str.length(); x++) for(int x = 0; x<str.length(); x++)
{ {
if(str.charAt(x) == '§') if(str.charAt(x) == Colors.White.charAt(0))
x++; x++;
else if("i;,.:|!".indexOf(str.charAt(x)) != -1) else if("i;,.:|!".indexOf(str.charAt(x)) != -1)
length+=2; length+=2;
@ -140,8 +140,8 @@ public class vMinecraftChat {
if(player.getColor() != null && player.getColor() != "") if(player.getColor() != null && player.getColor() != "")
output = player.getColor().substring(0,2) + output; output = player.getColor().substring(0,2) + output;
//Add the prefix if there is one //Add the prefix if there is one
if(playerPrefix != null && playerPrefix != "") if(playerPrefix != null && !playerPrefix.isEmpty())
output = applyColors(playerPrefix).substring(3) + output; output = applyColors(playerPrefix.substring(1)) + output;
//Return the name //Return the name
return output; return output;
@ -272,25 +272,26 @@ public class vMinecraftChat {
} }
return false; return false;
} }
public static boolean adminChatToggle(Player player, String message){
if(vMinecraftSettings.getInstance().isAdminToggled(player.getName())) { public static boolean adminChatToggle(Player player, String message){
String adminchat = Colors.DarkPurple + "{" + getName(player) if(vMinecraftSettings.getInstance().isAdminToggled(player.getName())) {
+ Colors.DarkPurple +"}" + Colors.White + " "; String adminchat = Colors.DarkPurple + "{" + getName(player)
String[] msg = wordWrap(adminchat + message.substring(1, message.length())); + Colors.DarkPurple +"}" + Colors.White + " ";
for (Player p: etc.getServer().getPlayerList()) { String[] msg = wordWrap(adminchat + message.substring(1, message.length()));
if (p != null) { for (Player p: etc.getServer().getPlayerList()) {
if (p.isAdmin() || p.canUseCommand("/adminchat")) { if (p != null) {
for(String str: msg) if (p.isAdmin() || p.canUseCommand("/adminchat")) {
p.sendMessage(str); for(String str: msg)
} p.sendMessage(str);
} }
} }
log.log(Level.INFO, "@" + "<" + getName(player)
+ Colors.White +"> " + message);
return true;
} }
return false; log.log(Level.INFO, "@" + "<" + getName(player)
+ Colors.White +"> " + message);
return true;
} }
return false;
}
//===================================================================== //=====================================================================
//Function: quote //Function: quote
@ -386,7 +387,7 @@ public class vMinecraftChat {
//===================================================================== //=====================================================================
public static String[] applyColors(String[] message) public static String[] applyColors(String[] message)
{ {
if(message != null && message[0] != null && !message[0].equals("")){ if(message != null && message[0] != null && !message[0].isEmpty()){
//The color to start the line with //The color to start the line with
String recentColor = Colors.White; String recentColor = Colors.White;
@ -400,8 +401,8 @@ public class vMinecraftChat {
//Loop through looking for a color code //Loop through looking for a color code
for(int x = 0; x< msg.length(); x++) for(int x = 0; x< msg.length(); x++)
{ {
//If the char is a ^ or � //If the char is a ^ or §
if(msg.charAt(x) == '^' || msg.charAt(x) == '§') if(msg.charAt(x) == '^' || msg.charAt(x) == Colors.White.charAt(0))
{ {
if(x != msg.length() - 1) if(x != msg.length() - 1)
{ {
@ -419,6 +420,8 @@ public class vMinecraftChat {
temp += msg.charAt(x); temp += msg.charAt(x);
} }
//Insert the character //Insert the character
} else {
temp += msg.charAt(x);
} }
} else { } else {
temp += msg.charAt(x); temp += msg.charAt(x);
@ -452,7 +455,7 @@ public class vMinecraftChat {
//===================================================================== //=====================================================================
public static String applyColors(String message, String color) public static String applyColors(String message, String color)
{ {
if(message != null && !message.equals("")) if(message != null && !message.isEmpty())
{ {
//The color to start the line with //The color to start the line with
if(color == null) if(color == null)
@ -464,8 +467,8 @@ public class vMinecraftChat {
//Loop through looking for a color code //Loop through looking for a color code
for(int x = 0; x< message.length(); x++) for(int x = 0; x< message.length(); x++)
{ {
//If the char is a ^ or � //If the char is a ^ or '§'
if(message.charAt(x) == '^' || message.charAt(x) == '§') if(message.charAt(x) == '^' || message.charAt(x) == Colors.White.charAt(0))
{ {
if(x != message.length() - 1) if(x != message.length() - 1)
{ {
@ -486,9 +489,13 @@ public class vMinecraftChat {
} else { } else {
temp += message.charAt(x); temp += message.charAt(x);
} }
//Insert the character
} else {
temp += message.charAt(x);
} }
} }
message = temp;
} }
return message; return message;
} }

15
vMinecraftListener.java
View File

@ -81,15 +81,16 @@ public class vMinecraftListener extends PluginListener {
//Use: Checks for exploits and runs the commands //Use: Checks for exploits and runs the commands
//===================================================================== //=====================================================================
public boolean onHealthChange(Player player,int oldValue,int newValue){ public boolean onHealthChange(Player player,int oldValue,int newValue){
if (player.getHealth() != vMinecraftSettings.getInstance().ezModoHealth() && vMinecraftSettings.getInstance().isEzModo(player.getName())) { if (player.getHealth() != vMinecraftSettings.getInstance().ezModoHealth()
player.setHealth(vMinecraftSettings.getInstance().ezModoHealth()); && vMinecraftSettings.getInstance().isEzModo(player.getName())) {
player.setHealth(vMinecraftSettings.getInstance().ezModoHealth());
}
else if (vMinecraftSettings.getInstance().globalmessages() && player.getHealth() < 1) {
vMinecraftChat.gmsg(Colors.Gray + player.getName() + " " + vMinecraftSettings.randomDeathMsg());
}
return false;
} }
else if (vMinecraftSettings.getInstance().globalmessages() && player.getHealth() < 1) {
vMinecraftChat.gmsg(Colors.Gray + player.getName() + " " + vMinecraftSettings.randomDeathMsg());
}
return false;
}
/** Not working yet, I posted the issue to hMod on github though /** Not working yet, I posted the issue to hMod on github though
public boolean onDamage(DamageType type, BaseEntity attacker, BaseEntity defender, int amount) { public boolean onDamage(DamageType type, BaseEntity attacker, BaseEntity defender, int amount) {