Merge branch 'dev'

This commit is contained in:
jomo
2014-06-23 01:18:28 +02:00
2 changed files with 9 additions and 14 deletions

View File

@@ -59,7 +59,7 @@ def onCgtCommand(sender, args):
msg(sender, "&8[&bCG&8] &e&oCG toggle: off")
else:
cg_toggle_list.append(p)
msg(sender, "&8[&bAC&8] &e&oCG toggle: on")
msg(sender, "&8[&bCG&8] &e&oCG toggle: on")
return True
def groupchat(sender, message, ann=False):

21
misc.py
View File

@@ -102,18 +102,13 @@ def onRulesCommand(sender, args):
return True
arrow = u"\u2192"
plugHeader(sender, "Redstoner rules")
msg(sender, "&31 &7" + arrow + " &bMake use of common sense and respect.")
msg(sender, "&32 &7" + arrow + " &bDo NOT ask for promotion.")
msg(sender, "&33 &7" + arrow + " &bDo NOT use cheats in Survival worlds.")
msg(sender, "&34 &7" + arrow + " &bDo NOT spam entities or leave clocks running.")
msg(sender, "&35 &7" + arrow + " &bSwearing is okay, offending is NOT.")
msg(sender, "&36 &7" + arrow + " &bDo NOT build huge walls around your plot.")
msg(sender, "&37 &7" + arrow + " &bListen to the admins and mods, even if it is not in the rules.")
msg(sender, "&38 &7" + arrow + " &bOnly english in public chat.")
msg(sender, "&39 &7" + arrow + " &bEveryone can get punished, even admins.")
msg(sender, "&310 &7" + arrow + " &bSame rules for everyone.")
msg(sender, "&311 &7" + arrow + " &bNO OP items.")
msg(sender, "&312 &7" + arrow + " &bDo NOT trap other players.")
msg(sender, "&31 &7 " + arrow + " &6Make use of common sense and respect.")
msg(sender, "&32 &7 " + arrow + " &6Do NOT ask for promotion.")
msg(sender, "&33 &7 " + arrow + " &6Do NOT cheat in Survival worlds.")
msg(sender, "&34 &7 " + arrow + " &6Do NOT spam entities or make big redstone clocks. (causes lag)")
msg(sender, "&35 &7 " + arrow + " &6Swearing is okay, swearing &oat&6 people is NOT.")
msg(sender, "&36 &7 " + arrow + " &6Do NOT build huge walls around your plot.")
msg(sender, "&37 &7 " + arrow + " &6Only english in public chat. Use &e/msg&6 or &e/cg&6.")
return True
@@ -222,4 +217,4 @@ def onTrCommand(sender, args):
@hook.command("faq")
def onFaqCommand(sender, args):
warp(sender, args, "faq")
return True
return True