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

Conflicts:
	loginsecurity.py
	player.py
This commit is contained in:
PanFritz
2015-08-18 00:24:26 +02:00
14 changed files with 521 additions and 85 deletions

View File

@@ -25,4 +25,4 @@ def on_join(event):
@hook.event("player.PlayerQuitEvent","highest")
def on_leave(event):
py_players.remove(get_py_player(event.getPlayer()))
py_players.remove(get_py_player(event.getPlayer()))