Browse Source

Still there are no prefixes =\

master
Stanislav Usenkov 10 years ago
parent
commit
de63f47799
  1. 3
      src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
  2. 2
      src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
  3. 4
      src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
  4. 2
      src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java
  5. 2
      src/main/java/ru/simsonic/rscPermissions/IndependentMain.java
  6. 6
      src/main/resources/languages/russian.yml

3
src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java

@ -65,6 +65,9 @@ public final class BukkitRegionProviders
{ {
this.worldguard = null; this.worldguard = null;
this.residence = null; this.residence = null;
regionsByPlayer.clear();
playerRegionHashes.clear();
playerLastWorld.clear();
} }
public synchronized boolean isRegionListChanged(Player player) public synchronized boolean isRegionListChanged(Player player)
{ {

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

@ -27,6 +27,8 @@ public class BukkitCommands
@Override @Override
public void run() public void run()
{ {
Thread.currentThread().setName("rscp:DatabaseFetchingThread");
Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
if(rscp.connection.isConnected() == false) if(rscp.connection.isConnected() == false)
if(rscp.connection.connect() == false) if(rscp.connection.connect() == false)
{ {

4
src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java

@ -1,4 +1,5 @@
package ru.simsonic.rscPermissions.Bukkit; package ru.simsonic.rscPermissions.Bukkit;
import java.util.Set;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -145,7 +146,8 @@ public final class VaultChat extends net.milkbowl.vault.chat.Chat
@Override @Override
public String[] getPlayerGroups(Player player) public String[] getPlayerGroups(Player player)
{ {
throw new UnsupportedOperationException("This method is unsupported by rscPermissions."); final Set<String> result = rscp.permissionManager.getPlayerGroups(player);
return result.toArray(new String[result.size()]);
} }
@Override @Override
public String getPrimaryGroup(String world, OfflinePlayer player) public String getPrimaryGroup(String world, OfflinePlayer player)

2
src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java

@ -11,7 +11,7 @@ public class Matchers
return multiobject.split(genericSplitter); return multiobject.split(genericSplitter);
} }
private static final Pattern patternUUID = Pattern.compile( private static final Pattern patternUUID = Pattern.compile(
"(?:[a-f\\d]{8}(?:-[a-f\\d]{4}){3}-[a-f\\d]{12})"); "^(?:[a-f\\d]{8}(?:-[a-f\\d]{4}){3}-[a-f\\d]{12})$");
private static boolean isCorrectUUID(String entityName) private static boolean isCorrectUUID(String entityName)
{ {
if(entityName == null) if(entityName == null)

2
src/main/java/ru/simsonic/rscPermissions/IndependentMain.java

@ -1,9 +1,7 @@
package ru.simsonic.rscPermissions; package ru.simsonic.rscPermissions;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import ru.simsonic.rscPermissions.Backends.BackendDatabase; import ru.simsonic.rscPermissions.Backends.BackendDatabase;
import ru.simsonic.rscPermissions.Backends.BackendJson; import ru.simsonic.rscPermissions.Backends.BackendJson;

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

@ -1,7 +1,7 @@
generic: generic:
enabled: "[rscp] Плагин успешно включён." enabled: "[rscp] Плагин rscPermissions успешно включён."
disabled: "[rscp] Плагин выключен." disabled: "[rscp] Плагин rscPermissions выключен."
reloaded: "[rscp] Плагин перезапущен." reloaded: "[rscp] Плагин rscPermissions перезапущен, конфигурация перечитана."
metrics: "[rscp] Включён сбор метрики (mcstats.org)." metrics: "[rscp] Включён сбор метрики (mcstats.org)."
mysql: mysql:
fetched: "[rscp] " fetched: "[rscp] "

Loading…
Cancel
Save