From de63f477997aed28a10b2b0c1277acc6a2a7b5d3 Mon Sep 17 00:00:00 2001
From: Stanislav Usenkov <SimSonic@users.noreply.github.com>
Date: Wed, 25 Feb 2015 22:03:50 +0600
Subject: [PATCH] Still there are no prefixes =\

---
 .../rscPermissions/Bukkit/BukkitRegionProviders.java        | 3 +++
 .../rscPermissions/Bukkit/Commands/BukkitCommands.java      | 2 ++
 .../java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java   | 4 +++-
 .../java/ru/simsonic/rscPermissions/Engine/Matchers.java    | 2 +-
 .../java/ru/simsonic/rscPermissions/IndependentMain.java    | 2 --
 src/main/resources/languages/russian.yml                    | 6 +++---
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
index 848302d..c4f647e 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
+++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/BukkitRegionProviders.java
@@ -65,6 +65,9 @@ public final class BukkitRegionProviders
 	{
 		this.worldguard = null;
 		this.residence = null;
+		regionsByPlayer.clear();
+		playerRegionHashes.clear();
+		playerLastWorld.clear();
 	}
 	public synchronized boolean isRegionListChanged(Player player)
 	{
diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
index e0ae1b6..66436b6 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
+++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/Commands/BukkitCommands.java
@@ -27,6 +27,8 @@ public class BukkitCommands
 		@Override
 		public void run()
 		{
+			Thread.currentThread().setName("rscp:DatabaseFetchingThread");
+			Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
 			if(rscp.connection.isConnected() == false)
 				if(rscp.connection.connect() == false)
 				{
diff --git a/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java b/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
index 7c0207a..1510cd6 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
+++ b/src/main/java/ru/simsonic/rscPermissions/Bukkit/VaultChat.java
@@ -1,4 +1,5 @@
 package ru.simsonic.rscPermissions.Bukkit;
+import java.util.Set;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -145,7 +146,8 @@ public final class VaultChat extends net.milkbowl.vault.chat.Chat
 	@Override
 	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
 	public String getPrimaryGroup(String world, OfflinePlayer player)
diff --git a/src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java b/src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java
index fefefae..fbd5645 100644
--- a/src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java
+++ b/src/main/java/ru/simsonic/rscPermissions/Engine/Matchers.java
@@ -11,7 +11,7 @@ public class Matchers
 		return multiobject.split(genericSplitter);
 	}
 	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)
 	{
 		if(entityName == null)
diff --git a/src/main/java/ru/simsonic/rscPermissions/IndependentMain.java b/src/main/java/ru/simsonic/rscPermissions/IndependentMain.java
index 601c65f..e9e84a8 100644
--- a/src/main/java/ru/simsonic/rscPermissions/IndependentMain.java
+++ b/src/main/java/ru/simsonic/rscPermissions/IndependentMain.java
@@ -1,9 +1,7 @@
 package ru.simsonic.rscPermissions;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.Map;
 import java.util.logging.Logger;
 import ru.simsonic.rscPermissions.Backends.BackendDatabase;
 import ru.simsonic.rscPermissions.Backends.BackendJson;
diff --git a/src/main/resources/languages/russian.yml b/src/main/resources/languages/russian.yml
index ef3b0e4..b525d5c 100644
--- a/src/main/resources/languages/russian.yml
+++ b/src/main/resources/languages/russian.yml
@@ -1,7 +1,7 @@
 generic:
-  enabled:  "[rscp] Плагин успешно включён."
-  disabled: "[rscp] Плагин выключен."
-  reloaded: "[rscp] Плагин перезапущен."
+  enabled:  "[rscp] Плагин rscPermissions успешно включён."
+  disabled: "[rscp] Плагин rscPermissions выключен."
+  reloaded: "[rscp] Плагин rscPermissions перезапущен, конфигурация перечитана."
   metrics:  "[rscp] Включён сбор метрики (mcstats.org)."
 mysql:
   fetched:  "[rscp] "