summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src
diff options
context:
space:
mode:
authorElgarL <ElgarL@Palmergames.com>2014-05-04 16:17:31 +0100
committerKHobbits <rob@khobbits.co.uk>2014-05-04 16:22:58 +0100
commitb0187698b9e7f4781fdc9e34d2a7dfb6da54c2f2 (patch)
treeb7f0836131f96c24891bedfd65f7be44b32512a7 /EssentialsGroupManager/src
parent0364d4e0de8c56d7db7f29dc2ea56d1e5c08f894 (diff)
downloadEssentials-b0187698b9e7f4781fdc9e34d2a7dfb6da54c2f2.tar
Essentials-b0187698b9e7f4781fdc9e34d2a7dfb6da54c2f2.tar.gz
Essentials-b0187698b9e7f4781fdc9e34d2a7dfb6da54c2f2.tar.lz
Essentials-b0187698b9e7f4781fdc9e34d2a7dfb6da54c2f2.tar.xz
Essentials-b0187698b9e7f4781fdc9e34d2a7dfb6da54c2f2.zip
Prevent players who have never logged in before from taking over existing accounts.
Diffstat (limited to 'EssentialsGroupManager/src')
-rw-r--r--EssentialsGroupManager/src/Changelog.txt3
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index baf46b004..50a947da7 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -229,4 +229,5 @@ v2.1:
- Add UUID support.
Plugins can still query by player name but a UUID is faster and preferable.
- Set a default mirror map if none is found in the config.
- - Fix clones forgetting sub groups. \ No newline at end of file
+ - Fix clones forgetting sub groups.
+ - Prevent players who have never logged in before from taking over existing accounts. \ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
index 14a9a052d..a6312ae70 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/WorldDataHolder.java
@@ -155,7 +155,7 @@ public class WorldDataHolder {
// Search for a LastName match
for (User usr : getUserList()) {
- if (usr.getLastName().equalsIgnoreCase(currentName)) {
+ if (usr.getLastName().equalsIgnoreCase(currentName) && !usr.getUUID().equalsIgnoreCase(usr.getLastName())) {
// Clone this user so we can set it's uUID
user = usr.clone(uUID, currentName);