parent
678182c644
commit
1415f0250f
|
@ -204,8 +204,8 @@ public class GroupManager extends JavaPlugin {
|
||||||
if (sender instanceof Player) {
|
if (sender instanceof Player) {
|
||||||
senderPlayer = (Player) sender;
|
senderPlayer = (Player) sender;
|
||||||
if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("manload")) {
|
if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("manload")) {
|
||||||
sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. " + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check plugins/groupmanager/error.log or console" + ChatColor.RESET + "" + ChatColor.RED
|
sender.sendMessage(
|
||||||
+ " and then try a '/manload'.");
|
ChatColor.RED + "所有的命令已被锁定由于载入错误. " + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check plugins/groupmanager/error.log or console" + ChatColor.RESET + "" + ChatColor.RED + " 请尝试使用命令 '/manload''.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
senderUser = worldsHolder.getWorldData(senderPlayer).getUser(senderPlayer.getName());
|
senderUser = worldsHolder.getWorldData(senderPlayer).getUser(senderPlayer.getName());
|
||||||
|
@ -216,8 +216,8 @@ public class GroupManager extends JavaPlugin {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("manload")) {
|
if (!lastError.isEmpty() && !commandLabel.equalsIgnoreCase("manload")) {
|
||||||
sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. " + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check plugins/groupmanager/error.log or console" + ChatColor.RESET + "" + ChatColor.RED
|
sender.sendMessage(
|
||||||
+ " and then try a '/manload'.");
|
ChatColor.RED + "所有的命令已被锁定由于载入错误. " + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check plugins/groupmanager/error.log or console" + ChatColor.RESET + "" + ChatColor.RED + " 请尝试使用命令 '/manload''.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
isConsole = true;
|
isConsole = true;
|
||||||
|
@ -318,7 +318,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!isConsole && !isOpOverride && (!permissionHandler.inGroup(senderUser.getLastName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getLastName(), auxGroup.getName()))) {
|
if (!isConsole && !isOpOverride && (!permissionHandler.inGroup(senderUser.getLastName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getLastName(), auxGroup.getName()))) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player involving a group that you don't inherit.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 involving a group that you don't inherit.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// Seems OK
|
// Seems OK
|
||||||
|
@ -347,7 +347,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
}
|
}
|
||||||
// Validating permission
|
// Validating permission
|
||||||
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player with same permissions as you, or higher.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 with same permissions as you, or higher.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// Seems OK
|
// Seems OK
|
||||||
|
@ -387,7 +387,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
}
|
}
|
||||||
// Validating permission
|
// Validating permission
|
||||||
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player with same permissions as you, or higher.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 with same permissions as you, or higher.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!isConsole && !isOpOverride && (permissionHandler.hasGroupInInheritance(auxGroup, senderGroup.getName()))) {
|
if (!isConsole && !isOpOverride && (permissionHandler.hasGroupInInheritance(auxGroup, senderGroup.getName()))) {
|
||||||
|
@ -395,7 +395,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!isConsole && !isOpOverride && (!permissionHandler.inGroup(senderUser.getLastName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getLastName(), auxGroup.getName()))) {
|
if (!isConsole && !isOpOverride && (!permissionHandler.inGroup(senderUser.getLastName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getLastName(), auxGroup.getName()))) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player involving a group that you don't inherit.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 involving a group that you don't inherit.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// Seems OK
|
// Seems OK
|
||||||
|
@ -430,7 +430,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
}
|
}
|
||||||
// Validating permission
|
// Validating permission
|
||||||
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player with same permissions as you, or higher.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 with same permissions as you, or higher.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// Seems OK
|
// Seems OK
|
||||||
|
@ -547,7 +547,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
for (int i = 1; i < args.length; i++) {
|
for (int i = 1; i < args.length; i++) {
|
||||||
auxString = args[i].replace("'", "");
|
auxString = args[i].replace("'", "");
|
||||||
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player with same group as you, or higher.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 with same group as you, or higher.");
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// Validating your permissions
|
// Validating your permissions
|
||||||
|
@ -596,7 +596,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
}
|
}
|
||||||
// Validating your permissions
|
// Validating your permissions
|
||||||
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player with same group as you, or higher.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 with same group as you, or higher.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
for (final String perm : auxUser.getPermissionList()) {
|
for (final String perm : auxUser.getPermissionList()) {
|
||||||
|
@ -1351,7 +1351,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
}
|
}
|
||||||
// Validating permission
|
// Validating permission
|
||||||
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player with same permissions as you, or higher.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 with same permissions as you, or higher.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// Seems OK
|
// Seems OK
|
||||||
|
@ -1409,7 +1409,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (count == 0) {
|
if (count == 0) {
|
||||||
sender.sendMessage(ChatColor.YELLOW + "There are no users in overload mode.");
|
sender.sendMessage(ChatColor.YELLOW + "在重载模式下没有用户.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (overloadedUsers.get(dataHolder.getName().toLowerCase()) == null) {
|
if (overloadedUsers.get(dataHolder.getName().toLowerCase()) == null) {
|
||||||
|
@ -1435,8 +1435,8 @@ public class GroupManager extends JavaPlugin {
|
||||||
*/
|
*/
|
||||||
if (args.length > 0) {
|
if (args.length > 0) {
|
||||||
if (!lastError.isEmpty()) {
|
if (!lastError.isEmpty()) {
|
||||||
sender.sendMessage(ChatColor.RED + "All commands are locked due to an error. " + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check plugins/groupmanager/error.log or console" + ChatColor.RESET + ""
|
sender.sendMessage(
|
||||||
+ ChatColor.RED + " and then try a '/manload'.");
|
ChatColor.RED + "所有的命令已被锁定由于载入错误. " + ChatColor.BOLD + "" + ChatColor.UNDERLINE + "Check plugins/groupmanager/error.log or console" + ChatColor.RESET + "" + ChatColor.RED + " 请尝试使用命令 '/manload''.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
auxString = "";
|
auxString = "";
|
||||||
|
@ -1523,7 +1523,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
}
|
}
|
||||||
// Validating permission
|
// Validating permission
|
||||||
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player with same permissions as you, or higher.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 with same permissions as you, or higher.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!isConsole && !isOpOverride && (permissionHandler.hasGroupInInheritance(auxGroup, senderGroup.getName()))) {
|
if (!isConsole && !isOpOverride && (permissionHandler.hasGroupInInheritance(auxGroup, senderGroup.getName()))) {
|
||||||
|
@ -1531,11 +1531,11 @@ public class GroupManager extends JavaPlugin {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!isConsole && !isOpOverride && (!permissionHandler.inGroup(senderUser.getLastName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getLastName(), auxGroup.getName()))) {
|
if (!isConsole && !isOpOverride && (!permissionHandler.inGroup(senderUser.getLastName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getLastName(), auxGroup.getName()))) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player involving a group that you don't inherit.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 involving a group that you don't inherit.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!permissionHandler.hasGroupInInheritance(auxUser.getGroup(), auxGroup.getName()) && !permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName())) {
|
if (!permissionHandler.hasGroupInInheritance(auxUser.getGroup(), auxGroup.getName()) && !permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName())) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player using groups with different heritage line.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 using groups with different heritage line.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName())) {
|
if (!permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName())) {
|
||||||
|
@ -1577,7 +1577,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
}
|
}
|
||||||
// Validating permission
|
// Validating permission
|
||||||
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getLastName(), senderGroup.getName()) : false)) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player with same permissions as you, or higher.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 with same permissions as you, or higher.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!isConsole && !isOpOverride && (permissionHandler.hasGroupInInheritance(auxGroup, senderGroup.getName()))) {
|
if (!isConsole && !isOpOverride && (permissionHandler.hasGroupInInheritance(auxGroup, senderGroup.getName()))) {
|
||||||
|
@ -1585,11 +1585,11 @@ public class GroupManager extends JavaPlugin {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!isConsole && !isOpOverride && (!permissionHandler.inGroup(senderUser.getLastName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getLastName(), auxGroup.getName()))) {
|
if (!isConsole && !isOpOverride && (!permissionHandler.inGroup(senderUser.getLastName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getLastName(), auxGroup.getName()))) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player involving a group that you don't inherit.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 involving a group that you don't inherit.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (!permissionHandler.hasGroupInInheritance(auxUser.getGroup(), auxGroup.getName()) && !permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName())) {
|
if (!permissionHandler.hasGroupInInheritance(auxUser.getGroup(), auxGroup.getName()) && !permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName())) {
|
||||||
sender.sendMessage(ChatColor.RED + "You can't modify a player using groups with different inheritage line.");
|
sender.sendMessage(ChatColor.RED + "你不能修改玩家 using groups with different inheritage line.");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName())) {
|
if (permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName())) {
|
||||||
|
@ -1621,7 +1621,7 @@ public class GroupManager extends JavaPlugin {
|
||||||
case manworld:
|
case manworld:
|
||||||
auxString = selectedWorlds.get(sender.getName());
|
auxString = selectedWorlds.get(sender.getName());
|
||||||
if (auxString != null) {
|
if (auxString != null) {
|
||||||
sender.sendMessage(ChatColor.YELLOW + "You have the world '" + dataHolder.getName() + "' in your selection.");
|
sender.sendMessage(ChatColor.YELLOW + "你选择了世界 '" + dataHolder.getName() + "'.");
|
||||||
} else {
|
} else {
|
||||||
if (dataHolder == null) {
|
if (dataHolder == null) {
|
||||||
sender.sendMessage(ChatColor.YELLOW + "没有选择世界。现在没有世界可以使用.");
|
sender.sendMessage(ChatColor.YELLOW + "没有选择世界。现在没有世界可以使用.");
|
||||||
|
|
Loading…
Reference in New Issue