mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-26 07:06:45 +01:00
Promote now has global messages. Demote now has a global message. You can now specify the rank in /promote. Players can have permission to /spromote to skip the permission checks involved with /promote.
This commit is contained in:
parent
e13e062e40
commit
534525c137
57
vCom.java
57
vCom.java
@ -1719,17 +1719,53 @@ private static HashMap<String, Player> hidden = new HashMap<String, Player>();
|
|||||||
if(!leave)
|
if(!leave)
|
||||||
myRank = 0;
|
myRank = 0;
|
||||||
|
|
||||||
//Make sure they're not promoting to their rank or higher
|
//Make sure they're not promoting to their rank or higher but only if they can't use /spromote
|
||||||
if(myRank <= tarRank + 1)
|
if(!player.canUseCommand("/spromote") &&
|
||||||
{
|
myRank <= tarRank + 1){
|
||||||
vChat.sendMessage(player, Colors.Rose + "You cannot promote someone to" +
|
vChat.sendMessage(player, Colors.Rose + "You cannot promote someone to" +
|
||||||
" your rank or higher.");
|
" your rank or higher.");
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
//If a rank is specified
|
||||||
|
if (args.length == 2)
|
||||||
|
{
|
||||||
|
//Assign designated rank to a variable
|
||||||
|
String[] newgroup = new String[1];
|
||||||
|
newgroup[0] = args[1];
|
||||||
|
//Reset some variables for reuse
|
||||||
|
leave = false;
|
||||||
|
tarRank = 0;
|
||||||
|
//Find what rank newgroup is if any
|
||||||
|
for(String rank : ranks)
|
||||||
|
{
|
||||||
|
for(String group : newgroup)
|
||||||
|
if(rank.equalsIgnoreCase(group))
|
||||||
|
{
|
||||||
|
|
||||||
|
leave = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if(leave)
|
||||||
|
break;
|
||||||
|
tarRank++;
|
||||||
|
}
|
||||||
|
if(!leave)
|
||||||
|
tarRank = 0;
|
||||||
|
|
||||||
|
//Make sure you're not promoting someone to above your rank (only if you can't use /spromote)
|
||||||
|
if(!player.canUseCommand("/spromote") &&
|
||||||
|
myRank <= tarRank + 1){
|
||||||
|
vChat.sendMessage(player, Colors.Rose + "You cannot promote someone to" +
|
||||||
|
" your rank or higher.");
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
|
target.setGroups(newgroup);
|
||||||
|
}
|
||||||
|
if(args.length < 2)
|
||||||
|
{
|
||||||
tarGroups[tarPos] = ranks[tarRank + 1];
|
tarGroups[tarPos] = ranks[tarRank + 1];
|
||||||
target.setGroups(tarGroups);
|
target.setGroups(tarGroups);
|
||||||
|
}
|
||||||
//Make sure the player is in the files
|
//Make sure the player is in the files
|
||||||
FlatFileSource ffs = new FlatFileSource();
|
FlatFileSource ffs = new FlatFileSource();
|
||||||
if(!ffs.doesPlayerExist(target.getName()))
|
if(!ffs.doesPlayerExist(target.getName()))
|
||||||
@ -1741,12 +1777,19 @@ private static HashMap<String, Player> hidden = new HashMap<String, Player>();
|
|||||||
{
|
{
|
||||||
ffs.modifyPlayer(target);
|
ffs.modifyPlayer(target);
|
||||||
}
|
}
|
||||||
|
//Check what kind of promotion happened before sending off any message
|
||||||
|
if(args.length == 1){
|
||||||
vChat.sendMessage(player, Colors.Rose + target.getName()
|
vChat.sendMessage(player, Colors.Rose + target.getName()
|
||||||
+ " has been promoted to " + ranks[tarRank + 1] + ".");
|
+ " has been promoted to " + ranks[tarRank + 1] + ".");
|
||||||
vChat.sendMessage(target, Colors.Rose + "You have been promoted to "
|
vChat.sendMessage(target, Colors.Rose + "You have been promoted to "
|
||||||
+ ranks[tarRank + 1] + ".");
|
+ ranks[tarRank + 1] + ".");
|
||||||
|
if(!vUsers.getProfile(player).isSilent())
|
||||||
|
vChat.gmsg(Colors.DarkPurple + player.getName() + " has promoted " + target.getName() + " to " + ranks[tarRank + 1]);
|
||||||
|
}
|
||||||
|
if(args.length == 2){
|
||||||
|
if(!vUsers.getProfile(player).isSilent())
|
||||||
|
vChat.gmsg(Colors.DarkPurple + player.getName() + " has promoted " + target.getName() + " to " + args[1]);
|
||||||
|
}
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1872,6 +1915,8 @@ private static HashMap<String, Player> hidden = new HashMap<String, Player>();
|
|||||||
+ " has been demoted to " + ranks[tarRank - 1] + ".");
|
+ " has been demoted to " + ranks[tarRank - 1] + ".");
|
||||||
vChat.sendMessage(target, Colors.Rose + "You have been demoted to "
|
vChat.sendMessage(target, Colors.Rose + "You have been demoted to "
|
||||||
+ ranks[tarRank - 1] + ".");
|
+ ranks[tarRank - 1] + ".");
|
||||||
|
if(!vUsers.getProfile(player).isSilent())
|
||||||
|
vChat.gmsg(Colors.DarkPurple + player.getName() + " has demoted " + target.getName() + " to " + ranks[tarRank - 1]);
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user