Archived
0

Fixed socialspy integration and group switching

This commit is contained in:
Pepich
2017-05-11 18:46:28 +02:00
parent a3a51968b2
commit fb171ff7c1

View File

@@ -29,7 +29,7 @@ import com.redstoner.modules.socialspy.Socialspy;
* *
* @author Pepich */ * @author Pepich */
@AutoRegisterListener @AutoRegisterListener
@Version(major = 2, minor = 1, revision = 0, compatible = 2) @Version(major = 2, minor = 1, revision = 1, compatible = 2)
public class Chatgroups implements Module, Listener public class Chatgroups implements Module, Listener
{ {
private static final char defaultKey = ':'; private static final char defaultKey = ':';
@@ -241,15 +241,17 @@ public class Chatgroups implements Module, Listener
{ {
String pname = Utils.getName(sender); String pname = Utils.getName(sender);
String group = getGroup(sender); String group = getGroup(sender);
if (group != null && !group.equals(name)) if (group != null && group.equals(name))
Utils.sendErrorMessage(sender, null, "You were already in group §6" + name);
else
{ {
setGroup(sender, null);
if (group != null)
sendToGroup(group, "&9" + pname + " &7left the group!");
sendToGroup(name, "&9" + pname + " &7joined the group!"); sendToGroup(name, "&9" + pname + " &7joined the group!");
setGroup(sender, name); setGroup(sender, name);
sendToGroup(group, "&9" + pname + " &7left the group!");
Utils.sendMessage(sender, null, "Successfully joined group §6" + name); Utils.sendMessage(sender, null, "Successfully joined group §6" + name);
} }
else
Utils.sendErrorMessage(sender, null, "You were already in group §6" + name);
return true; return true;
} }