Browse Source

Fixes.

master
Stanislav Usenkov 9 years ago
parent
commit
46666548e9
  1. 6
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitUtilities.java
  2. 16
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
  3. 16
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java
  4. 1
      src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java
  5. 1
      src/main/resources/languages/english.yml
  6. 1
      src/main/resources/languages/russian.yml

6
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitUtilities.java

@ -18,13 +18,15 @@ public class BukkitUtilities
} }
public static OfflinePlayer findOfflinePlayer(String player) public static OfflinePlayer findOfflinePlayer(String player)
{ {
final String srcUniqueId = player.replace("-", "").toLowerCase();
OfflinePlayer result = null; OfflinePlayer result = null;
for(OfflinePlayer offline : Bukkit.getOfflinePlayers()) for(OfflinePlayer offline : Bukkit.getOfflinePlayers())
{ {
try try
{ {
// Immediately return if UUID is the same // Immediately return if UUID is the same\
if(offline.getUniqueId().toString().replace("-", "").equalsIgnoreCase(player)) final String dstUniqueId = offline.getUniqueId().toString().replace("-", "");
if(dstUniqueId.equalsIgnoreCase(srcUniqueId))
{ {
result = offline; result = offline;
break; break;

16
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java

@ -152,22 +152,22 @@ public class BukkitCommands
return; return;
case "lock": case "lock":
cmdLock.executeLock(sender, args); cmdLock.executeLock(sender, args);
return; throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString());
case "unlock": case "unlock":
cmdLock.executeUnlock(sender); cmdLock.executeUnlock(sender);
return; throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString());
case "fetch": case "fetch":
cmdReload.executeFetch(sender); cmdReload.executeFetch(sender);
return; throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString());
case "reload": case "reload":
cmdReload.executeReload(sender); cmdReload.executeReload(sender);
return; throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString());
case "update": case "update":
cmdReload.executeUpdate(sender, args); cmdReload.executeUpdate(sender, args);
return; throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString());
case "debug": case "debug":
cmdDebug.execute(sender, args); cmdDebug.execute(sender, args);
return; throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString());
case "examplerows": case "examplerows":
/* DEPRECATED: rscp examplerows */ /* DEPRECATED: rscp examplerows */
if(sender.hasPermission("rscp.admin")) if(sender.hasPermission("rscp.admin"))
@ -175,7 +175,7 @@ public class BukkitCommands
threadInsertExampleRows(sender); threadInsertExampleRows(sender);
throw new CommandAnswerException("Example rows have been added into database."); throw new CommandAnswerException("Example rows have been added into database.");
} }
break; throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString());
case "import": case "import":
/* DEPRECATED: rscp import pex-sql*/ /* DEPRECATED: rscp import pex-sql*/
if(sender.hasPermission("rscp.admin")) if(sender.hasPermission("rscp.admin"))
@ -196,7 +196,7 @@ public class BukkitCommands
break; break;
} }
} }
return; throw new CommandAnswerException(Phrases.NO_PERMISSIONS.toString());
case "help": case "help":
default: default:
break; break;

16
src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/CommandEntity.java

@ -65,8 +65,8 @@ public class CommandEntity extends CommandEntityHelper
templt.add("{_YL}/rscp {:T} [new] <name> removepermission <perm|id>"); templt.add("{_YL}/rscp {:T} [new] <name> removepermission <perm|id>");
templt.add("{_YL}[options] {_LS}can be:"); templt.add("{_YL}[options] {_LS}can be:");
templt.add("{_LS}1. {_WH}destination <destination> {_LS} -- it is destination, yes."); templt.add("{_LS}1. {_WH}destination <destination> {_LS} -- it is destination, yes.");
templt.add("{_LS}2. {_WH}expirience <levels> {_LS} -- NOT WORKING."); // templt.add("{_LS}2. {_WH}expirience <levels> {_LS} -- NOT WORKING.");
templt.add("{_LS}3. {_WH}lifitime <?!?> {_LS} -- NOT READY, will be like '1hours12min30s'."); // templt.add("{_LS}3. {_WH}lifetime <time> {_LS} -- NOT READY, eg. '1hours12min30s'.");
break; break;
case PLAYER: case PLAYER:
templt.add("{_YL}/rscp {:T} listgroups {_LS}- show resulting inheritance tree"); templt.add("{_YL}/rscp {:T} listgroups {_LS}- show resulting inheritance tree");
@ -160,29 +160,21 @@ public class CommandEntity extends CommandEntityHelper
if(convertToName || convertToUUID || convertToIPv4) if(convertToName || convertToUUID || convertToIPv4)
{ {
// Convert player into user with specified parameter // Convert player into user with specified parameter
forceEntityCreation = true;
try try
{ {
if(offline != null && convertToName) if(offline != null && convertToName)
{
target = offline.getName(); target = offline.getName();
forceEntityCreation = true;
}
} catch(RuntimeException | NoSuchMethodError ex) { } catch(RuntimeException | NoSuchMethodError ex) {
} }
try try
{ {
if(offline != null && convertToUUID) if(offline != null && convertToUUID)
{
target = offline.getUniqueId().toString(); target = offline.getUniqueId().toString();
forceEntityCreation = true;
}
} catch(RuntimeException | NoSuchMethodError ex) { } catch(RuntimeException | NoSuchMethodError ex) {
} }
if(online != null && convertToIPv4) if(online != null && convertToIPv4)
{
target = online.getAddress().getAddress().getHostAddress(); target = online.getAddress().getAddress().getHostAddress();
forceEntityCreation = true;
}
args = Arrays.copyOfRange(args, 1, args.length); args = Arrays.copyOfRange(args, 1, args.length);
args[0] = target; args[0] = target;
type = TargetType.USER; type = TargetType.USER;
@ -341,7 +333,7 @@ public class CommandEntity extends CommandEntityHelper
private void showPlayerDetails(ResolutionResult result, OfflinePlayer offline) throws CommandAnswerException private void showPlayerDetails(ResolutionResult result, OfflinePlayer offline) throws CommandAnswerException
{ {
final List<String> answer = new ArrayList<>(8); final List<String> answer = new ArrayList<>(8);
answer.add("What do I know about him?:"); answer.add("What do I know about this player?:");
if(offline != null) if(offline != null)
{ {
// Show name, uuid // Show name, uuid

1
src/main/java/ru/simsonic/rscPermissions/Engine/Phrases.java

@ -31,6 +31,7 @@ public enum Phrases
INTEGRATION_WG_OLD ("integration.worldguard-old"), INTEGRATION_WG_OLD ("integration.worldguard-old"),
INTEGRATION_R_Y ("integration.residence-yes"), INTEGRATION_R_Y ("integration.residence-yes"),
INTEGRATION_R_N ("integration.residence-no"), INTEGRATION_R_N ("integration.residence-no"),
NO_PERMISSIONS ("generic.no-permissions"),
DEBUG_ON ("debug.enable"), DEBUG_ON ("debug.enable"),
DEBUG_OFF ("debug.disable"), DEBUG_OFF ("debug.disable"),
DEBUG_FETCH_TIME ("debug.fetch-time"), DEBUG_FETCH_TIME ("debug.fetch-time"),

1
src/main/resources/languages/english.yml

@ -3,6 +3,7 @@ generic:
disabled: "[rscp] rscPermissions has been disabled." disabled: "[rscp] rscPermissions has been disabled."
metrics: "[rscp] Metrics enabled." metrics: "[rscp] Metrics enabled."
reloaded: "{_LG}Plugin and it's configuration were reloaded." reloaded: "{_LG}Plugin and it's configuration were reloaded."
no-permissions: "{_LG}Not enough permissions to run this command."
player-only: "{_LR}This command cannot be run from console." player-only: "{_LR}This command cannot be run from console."
console-only: "{_LR}This command should be run from console." console-only: "{_LR}This command should be run from console."
server-is-full: "{_LR}Server is full, empty slots are in reserve." server-is-full: "{_LR}Server is full, empty slots are in reserve."

1
src/main/resources/languages/russian.yml

@ -3,6 +3,7 @@ generic:
disabled: "[rscp] Плагин rscPermissions выключен." disabled: "[rscp] Плагин rscPermissions выключен."
metrics: "[rscp] Включён сбор статистической информации (mcstats.org)." metrics: "[rscp] Включён сбор статистической информации (mcstats.org)."
reloaded: "{_LG}Плагин перезапущен, конфигурация перечитана." reloaded: "{_LG}Плагин перезапущен, конфигурация перечитана."
no-permissions: "{_LG}Недостаточно прав для выполнения данной команды."
player-only: "{_LR}Эта команда не может быть использована из консоли." player-only: "{_LR}Эта команда не может быть использована из консоли."
console-only: "{_LR}Эта команда может быть использована только из консоли." console-only: "{_LR}Эта команда может быть использована только из консоли."
server-is-full: "{_LR}Сервер заполнен, оставшиеся слоты находятся в резерве." server-is-full: "{_LR}Сервер заполнен, оставшиеся слоты находятся в резерве."

Loading…
Cancel
Save