Compare commits
1 Commits
chatgroup-
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
347f6969bf |
@@ -2,6 +2,7 @@
|
|||||||
from helpers import *
|
from helpers import *
|
||||||
from basecommands import simplecommand
|
from basecommands import simplecommand
|
||||||
from java.util.UUID import fromString as juuid
|
from java.util.UUID import fromString as juuid
|
||||||
|
from traceback import format_exc as trace
|
||||||
|
|
||||||
groups = open_json_file("chatgroups", {})
|
groups = open_json_file("chatgroups", {})
|
||||||
cg_defaultkey = ":"
|
cg_defaultkey = ":"
|
||||||
@@ -31,7 +32,7 @@ def on_chatgroup_command(sender, command, label, args):
|
|||||||
if sender_id in groups.keys():
|
if sender_id in groups.keys():
|
||||||
group = groups[sender_id]
|
group = groups[sender_id]
|
||||||
msg(sender, "&aCurrent chatgroup: %s" % group)
|
msg(sender, "&aCurrent chatgroup: %s" % group)
|
||||||
users = [user.getName() for user in [server.getOfflinePlayer(juuid(uuid)) for uuid, ugroup in groups.iteritems() if ugroup == group] if user]
|
users = [user.getDisplayName() for user in [server.getPlayer(juuid(uuid)) for uuid, ugroup in groups.iteritems() if ugroup == group] if user]
|
||||||
msg(sender, "&aUsers in this group:")
|
msg(sender, "&aUsers in this group:")
|
||||||
msg(sender, "&a%s" % ", ".join(users))
|
msg(sender, "&a%s" % ", ".join(users))
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ class Slave(object):
|
|||||||
def update(self):
|
def update(self):
|
||||||
self.blocks -= 1
|
self.blocks -= 1
|
||||||
if self.blocks <= 0:
|
if self.blocks <= 0:
|
||||||
|
server.getPlayer(juuid(self.get_uuid())).teleport(server.getWorld(spawn_world).getSpawnLocation())
|
||||||
server.getPlayer(juuid(self.get_uuid())).teleport(server.getWorld(spawn_world).getSpawnLocation())
|
server.getPlayer(juuid(self.get_uuid())).teleport(server.getWorld(spawn_world).getSpawnLocation())
|
||||||
slaves.remove(self)
|
slaves.remove(self)
|
||||||
save_slaves()
|
save_slaves()
|
||||||
|
|||||||
Reference in New Issue
Block a user