Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-10-22 20:30:53 +02:00
Code Issues Projects Releases Wiki Activity

Added checking to make sure that the next character after a ^ is color code.

Browse Source
This commit is contained in:
cerevisiae 2010-11-30 03:40:47 -06:00
parent 42b8bd8ee1
commit d2b64044e2
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vminecraftChat.java
View File

@ -225,7 +225,7 @@ public class vminecraftChat {
color = Colors.White;
break;
default:
color = Colors.White;
color = null;
break;
}
return color;
@ -381,14 +381,24 @@ public class vminecraftChat {
//Loop through looking for a color code
for(int x = 0; x< msg.length(); x++)
{
//If the char is a ^
if(msg.charAt(x)=='^' && x != msg.length() - 1)
{
//Set the most recent color to the new color
recentColor = vminecraftChat.colorChange(msg.charAt(x+1));
temp += recentColor;
x++;
}
else{
//If the following character is a color code
if(vminecraftChat.colorChange(msg.charAt(x+1)) != null)
{
//Set the most recent color to the new color
recentColor = vminecraftChat.colorChange(msg.charAt(x+1));
//Add the color
temp += recentColor;
//Skip these chars
x++;
//Otherwise ignore it.
} else {
temp += msg.charAt(x);
}
//Insert the character
} else {
temp += msg.charAt(x);
}
}

9
vminecraftCommands.java
View File

@ -61,13 +61,12 @@ public class vminecraftCommands{
if(vminecraftSettings.getInstance().cmdHeal())
{
//If a target wasn't specified, heal the user.
if (args == null){
if (player.getHealth() < 20){
vminecraftChat.gmsg("Your health is restored");
}
if (args.length < 1){
player.setHealth(20);
player.sendMessage("Your health is restored");
//If a target was specified, try to find them and then heal them
//Otherwise report the error
} else if (args != null){
} else if (args.length > 0){
Player playerTarget = etc.getServer().matchPlayer(args[0]);
if (playerTarget != null){