diff --git a/.idea/TFGuilds.iml b/.idea/TFGuilds.iml
new file mode 100644
index 0000000..d0c8bd9
--- /dev/null
+++ b/.idea/TFGuilds.iml
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+ SPIGOT
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 23a21e0..eb5071b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
me.totalfreedom
TFGuilds
- 0.2.16
+ 0.2.17
jar
TFGuilds
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java b/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java
index 294b329..e66fb69 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java
@@ -72,6 +72,8 @@ public class GuildCommand extends Common implements CommandExecutor, TabComplete
return new ToggleTagsSubcommand().onCommand(sender, command, label, args);
case "toggletag":
return new ToggleTagSubcommand().onCommand(sender, command, label, args);
+ case "setmember":
+ return new SetMemberSubcommand().onCommand(sender, command, label, args);
}
sender.sendMessage(tl(PREFIX + "Unknown command - Run /g help if you need help"));
return true;
@@ -89,7 +91,7 @@ public class GuildCommand extends Common implements CommandExecutor, TabComplete
"deleterank", "disband", "help", "home", "info", "invite",
"join", "kick", "leave", "list", "motd", "removemod", "rename",
"roster", "setowner", "setrank", "setstate", "tag", "tp", "setdefaultrank",
- "toggletags", "toggletag");
+ "toggletags", "toggletag", "setmember");
}
else if (args.length == 2)
{
@@ -103,6 +105,7 @@ public class GuildCommand extends Common implements CommandExecutor, TabComplete
case "info":
case "join":
case "roster":
+ case "setmember":
{
return Guild.getGuildList();
}
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java
index a2918b3..3071fca 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java
@@ -37,6 +37,7 @@ public class HelpSubcommand extends Common implements CommandExecutor
sender.sendMessage(tl("%s% - %p%setdefaultrank "));
sender.sendMessage(tl("%s% - %p%toggletags"));
sender.sendMessage(tl("%s% - %p%toggletag [player]"));
+ sender.sendMessage(tl("%s% - %p%setmember "));
return true;
}
}
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/SetMemberSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/SetMemberSubcommand.java
new file mode 100644
index 0000000..89051c4
--- /dev/null
+++ b/src/main/java/me/totalfreedom/tfguilds/command/SetMemberSubcommand.java
@@ -0,0 +1,54 @@
+package me.totalfreedom.tfguilds.command;
+
+import me.totalfreedom.tfguilds.Common;
+import me.totalfreedom.tfguilds.guild.Guild;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class SetMemberSubcommand extends Common implements CommandExecutor
+{
+ @Override
+ public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
+ {
+ if (args.length == 1 || args.length == 2 || args.length > 3)
+ {
+ sender.sendMessage(tl(PREFIX + "Proper usage: /g setmember "));
+ return true;
+ }
+
+ if (!plugin.bridge.isAdmin(sender))
+ {
+ sender.sendMessage(NO_PERMS);
+ return true;
+ }
+
+ Guild guild = Guild.getGuild(args[1]);
+ if (guild == null)
+ {
+ sender.sendMessage(ChatColor.RED + "That guild doesn't exist!");
+ return true;
+ }
+
+ Player player = Bukkit.getPlayer(args[2]);
+ if (player == null)
+ {
+ sender.sendMessage(PNF);
+ return true;
+ }
+
+ if (Guild.getGuild(player) != null)
+ {
+ sender.sendMessage(ChatColor.RED + "This player is already in another guild!");
+ return true;
+ }
+
+ guild.addMember(player.getName());
+ guild.broadcast(tl("%s%" + player.getName() + " %p%has joined the guild."));
+ guild.save();
+ return true;
+ }
+}
\ No newline at end of file