Merge remote-tracking branch 'origin/dev'

This commit is contained in:
Dico200
2015-04-29 03:31:25 +02:00
2 changed files with 2 additions and 3 deletions
-1
View File
@@ -127,7 +127,6 @@ def adminnotes_command(sender, command, label, args):
def on_an_join(event): def on_an_join(event):
player = event.getPlayer() player = event.getPlayer()
if not player.hasPermission(an_permission): if not player.hasPermission(an_permission):
noperm(player)
return return
if len(notes) > 0: if len(notes) > 0:
msg(player, "&cThere are currently %s open notes!" % len(notes)) msg(player, "&cThere are currently %s open notes!" % len(notes))
+2 -2
View File
@@ -75,9 +75,9 @@ shared["load_modules"] = [
#adds snowbrawl minigame #adds snowbrawl minigame
#"snowbrawl", #"snowbrawl",
# Adds /tm [player] for a messages to be sent to this player via /msg # Adds /tm [player] for a messages to be sent to this player via /msg
"pmtoggle", "pmtoggle"
# Replacement for LoginSecurity # Replacement for LoginSecurity
"loginsecurity" #"loginsecurity"
# NOTICE: If you add something here, please add a small descriptive comment above! # NOTICE: If you add something here, please add a small descriptive comment above!
] ]
shared["modules"] = {} shared["modules"] = {}