summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src
diff options
context:
space:
mode:
authorElgarL <ElgarL@Palmergames.com>2014-05-04 16:17:31 +0100
committerElgarL <ElgarL@Palmergames.com>2014-05-04 16:17:31 +0100
commit578aec35ebffc002215f802c488145787e8dc54e (patch)
tree01ddaebf03afe697447e939315ebc51db0ab73cb /EssentialsGroupManager/src
parenta8ad83fb0b85fc05ff6c03c5c8860eb16df5430d (diff)
downloadEssentials-578aec35ebffc002215f802c488145787e8dc54e.tar
Essentials-578aec35ebffc002215f802c488145787e8dc54e.tar.gz
Essentials-578aec35ebffc002215f802c488145787e8dc54e.tar.lz
Essentials-578aec35ebffc002215f802c488145787e8dc54e.tar.xz
Essentials-578aec35ebffc002215f802c488145787e8dc54e.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);