Merge branch 'dev' of github.com:RedstonerServer/redstoner-utils into dev

Conflicts: loginsecurity.py player.py
2015-08-18 00:24:26 +02:00
parent 6574179872 2310c9143a
commit 0ea6183c03
14 changed files with 521 additions and 85 deletions
--- a/helpers.py
+++ b/helpers.py
@@ -128,7 +128,7 @@ def runas(player, cmd):
        player.chat("/" + cmd)
    else:
        server.dispatchCommand(player, cmd)
-    
+

 def is_player(obj):
    """