diff options
author | ElgarL <ElgarL@palmergames.com> | 2013-02-04 05:29:10 -0800 |
---|---|---|
committer | ElgarL <ElgarL@palmergames.com> | 2013-02-04 05:29:10 -0800 |
commit | 6249a5c2c00f06c57f00f4a5e7f673c16f601454 (patch) | |
tree | 6f2adbb8deae5f406300ec98a10536d7a82589c1 /EssentialsGroupManager/src/org/anjocaido | |
parent | f22bf97dffd807e5d6538bef96a9e92d01a0d92c (diff) | |
parent | e03a6880406c7a3a07a572ea610030a21827e58f (diff) | |
download | Essentials-6249a5c2c00f06c57f00f4a5e7f673c16f601454.tar Essentials-6249a5c2c00f06c57f00f4a5e7f673c16f601454.tar.gz Essentials-6249a5c2c00f06c57f00f4a5e7f673c16f601454.tar.lz Essentials-6249a5c2c00f06c57f00f4a5e7f673c16f601454.tar.xz Essentials-6249a5c2c00f06c57f00f4a5e7f673c16f601454.zip |
Merge pull request #291 from necrodoom/patch-32
display name instead of path for /mancheckw
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido')
3 files changed, 14 insertions, 4 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index da978b9cc..b9eebe7e7 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -1975,8 +1975,8 @@ public class GroupManager extends JavaPlugin { sender.sendMessage(ChatColor.YELLOW + "You have selected world '" + dataHolder.getName() + "'."); sender.sendMessage(ChatColor.YELLOW + "This world is using the following data files.."); - sender.sendMessage(ChatColor.YELLOW + "Groups: " + dataHolder.getGroupsFile().getAbsolutePath()); - sender.sendMessage(ChatColor.YELLOW + "Users: " + dataHolder.getUsersFile().getAbsolutePath()); + sender.sendMessage(ChatColor.YELLOW + "Groups:" + ChatColor.GREEN + " " + dataHolder.getGroupsFile().getDataSource.getName()); + sender.sendMessage(ChatColor.YELLOW + "Users:" + ChatColor.GREEN + " " + dataHolder.getUsersFile().getDataSource.getName()); return true; diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java index 418405f65..1ae4d06bc 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/GroupsDataHolder.java @@ -42,6 +42,11 @@ public class GroupsDataHolder { group.setDataSource(this.dataSource);
}
}
+
+ public WorldDataHolder getDataSource() {
+
+ return this.dataSource;
+ }
/**
* @return the defaultGroup
@@ -123,4 +128,4 @@ public class GroupsDataHolder { this.timeStampGroups = timeStampGroups;
}
-}
\ No newline at end of file +} diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java index 5f14a7d45..ee822f1af 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/UsersDataHolder.java @@ -50,6 +50,11 @@ public class UsersDataHolder { return users;
}
+
+ public WorldDataHolder getDataSource() {
+
+ return this.dataSource;
+ }
/**
* Resets the Users
@@ -106,4 +111,4 @@ public class UsersDataHolder { this.timeStampUsers = timeStampUsers;
}
-}
\ No newline at end of file +}
|