1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
This commit is contained in:
Steffo 2016-04-19 12:23:59 -04:00
parent bef5f70797
commit 8569a6fa3f

View file

@ -349,14 +349,9 @@ while True:
p.message(g.mifiastatus()) p.message(g.mifiastatus())
elif t['text'].startswith("/fullstatus"): elif t['text'].startswith("/fullstatus"):
if t['from']['id'] == g.adminid: if t['from']['id'] == g.adminid:
<<<<<<< HEAD
g.adminmessage(g.fullstatus())
g.adminmessage(g.displaycount())
=======
g.adminmessage(g.fullstatus() + "\n" + g.displaycount()) g.adminmessage(g.fullstatus() + "\n" + g.displaycount())
else: else:
g.message("\u26A0\uFE0F Non sei il creatore della partita; non puoi vedere lo status completo.") g.message("\u26A0\uFE0F Non sei il creatore della partita; non puoi vedere lo status completo.")
>>>>>>> 6a580d30baa57bd0c46db6953c19f07ee865ac5e
elif t['text'].startswith("/save"): elif t['text'].startswith("/save"):
if t['from']['id'] == g.adminid: if t['from']['id'] == g.adminid:
g.save() g.save()