Redstoner/redstoner-utils
Archived
0
Fork 0
Code Issues 6 Pull Requests Wiki Activity

Uses UUID now + cg_key is now :

Browse Source
This commit is contained in:
Louis Vogt
2014-07-11 23:50:27 +02:00
parent f3c781ab47
commit b8b86be805
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
chatgroups.py
View File

@@ -4,7 +4,7 @@ import simplejson as json
chatgroups_filename = "plugins/redstoner-utils.py.dir/files/chatgroups.json" chatgroups_filename = "plugins/redstoner-utils.py.dir/files/chatgroups.json"
groups = {} groups = {}
cg_key = "." cg_key = ":"
cg_toggle_list = [] cg_toggle_list = []
try: try:
@@ -18,7 +18,7 @@ def onChatgroupCommand(sender, args):
try: try:
plugHeader(sender, "ChatGroups") plugHeader(sender, "ChatGroups")
if len(args) == 1 and args[0] == "leave": if len(args) == 1 and args[0] == "leave":
if sender.getName() in groups.keys(): if str(sender.getUniqueId()) in groups.keys():
groupchat(sender, "left the group", True) groupchat(sender, "left the group", True)
group = groups[sender.getName()] group = groups[sender.getName()]
del(groups[sender.getName()]) del(groups[sender.getName()])
@@ -26,8 +26,8 @@ def onChatgroupCommand(sender, args):
else: else:
msg(sender, "&aYou can't leave no group, derp!") msg(sender, "&aYou can't leave no group, derp!")
elif len(args) == 1 and args[0] == "info": elif len(args) == 1 and args[0] == "info":
if sender.getName() in groups.keys(): if str(sender.getUniqueId()) in groups.keys():
group = groups[sender.getName()] group = groups[str(sender.getUniqueId())]
msg(sender, "&aCurrent chatgroup: %s" % group) msg(sender, "&aCurrent chatgroup: %s" % group)
users = [] users = []
for user, ugroup in groups.iteritems(): for user, ugroup in groups.iteritems():
@@ -38,7 +38,7 @@ def onChatgroupCommand(sender, args):
else: else:
msg(sender, "&aYou're in no chatgroup.") msg(sender, "&aYou're in no chatgroup.")
elif len(args) == 2 and args[0] == "join": elif len(args) == 2 and args[0] == "join":
groups[sender.getName()] = args[1] groups[str(sender.getUniqueId())] = args[1]
groupchat(sender, "joined the group", True) groupchat(sender, "joined the group", True)
saveGroups() saveGroups()
msg(sender, "&aYour chatgroup is set to '%s'" % args[1]) msg(sender, "&aYour chatgroup is set to '%s'" % args[1])
@@ -53,7 +53,7 @@ def onChatgroupCommand(sender, args):
@hook.command("cgt") @hook.command("cgt")
def onCgtCommand(sender, args): def onCgtCommand(sender, args):
p = sender.getName() p = str(sender.getUniqueId())
if p in cg_toggle_list: if p in cg_toggle_list:
cg_toggle_list.remove(p) cg_toggle_list.remove(p)
msg(sender, "&8[&bCG&8] &e&oCG toggle: off") msg(sender, "&8[&bCG&8] &e&oCG toggle: off")
@@ -64,7 +64,7 @@ def onCgtCommand(sender, args):
def groupchat(sender, message, ann=False): def groupchat(sender, message, ann=False):
#try: #try:
group = groups.get(sender.getName()) group = groups.get(str(sender.getUniqueId()))
if group == None: if group == None:
msg(sender, "&cYou are not in a group!") msg(sender, "&cYou are not in a group!")
return return
@@ -74,7 +74,7 @@ def groupchat(sender, message, ann=False):
else: else:
mesg = "&8[&bCG&8] &f%s&f: &6%s" % (name, message) mesg = "&8[&bCG&8] &f%s&f: &6%s" % (name, message)
for receiver in server.getOnlinePlayers(): for receiver in server.getOnlinePlayers():
groups.get(receiver.getName()) == group and msg(receiver, mesg) groups.get(str(receiver.getUniqueId())) == group and msg(receiver, mesg)
#except Exception, e: #except Exception, e:
# error(e) # error(e)
@@ -93,9 +93,9 @@ def onChat(event):
sender = event.getPlayer() sender = event.getPlayer()
msge = event.getMessage() msge = event.getMessage()
if not event.isCancelled(): if not event.isCancelled():
if msge[:len(cg_key)] == cg_key and sender.getName() in groups.keys(): if msge[:len(cg_key)] == cg_key and str(sender.getUniqueId()) in groups.keys():
groupchat(sender, msge[1:]) groupchat(sender, msge[1:])
event.setCancelled(True) event.setCancelled(True)
elif sender.getName() in cg_toggle_list: elif str(sender.getUniqueId()) in cg_toggle_list:
groupchat(sender, msge) groupchat(sender, msge)
event.setCancelled(True) event.setCancelled(True)