diff --git a/service_plugins/minecraft.py b/service_plugins/minecraft.py index cd204389a74987d85c6ed273437b04fbd329dc42..42f2126140760c4354a2f315bc710ee0a317338d 100644 --- a/service_plugins/minecraft.py +++ b/service_plugins/minecraft.py @@ -3,6 +3,7 @@ import services import db import mysql.connector +RCON_ADDRESS="172.16.25.100" AUTHME_DB_HOST="172.16.25.101" def register(add_endpoint, add_postable_endpoint, add_menu): @@ -44,7 +45,7 @@ def minecraft_username(**kwargs): return rqtools.get_400(None) if player_exists(request.form['username'], session['username']): return rqtools.get_403(None, errormsg="This player is already registered by someone else.") - with Client('127.0.0.1', 25575, passwd='nagy0nmen0rc0n') as mcclient: + with Client(RCON_ADDRESS, 25575, passwd='nagy0nmen0rc0n') as mcclient: response = mcclient.run('kick', x['mcuser']) authmedb = mysql.connector.connect( host=AUTHME_DB_HOST, user='authme', password='12345', database='authme', charset="utf8mb3") @@ -56,7 +57,7 @@ def minecraft_username(**kwargs): authmedb.commit() db.mc_users.update_one(filter={'username': session['username']}, update={ '$set': {'mcuser': request.form['username']}}) - with Client('127.0.0.1', 25575, passwd='nagy0nmen0rc0n') as mcclient: + with Client(RCON_ADDRESS, 25575, passwd='nagy0nmen0rc0n') as mcclient: response = mcclient.run('authme', 'reload') return rqtools.redirect(rqtools.url_for('service', servicename='minecraft')) @@ -78,7 +79,7 @@ def minecraft_password(**kwargs): x = db.mc_users.find_one(filter={'username': session['username']}) if x is None: return rqtools.get_403(None) - with Client('127.0.0.1', 25575, passwd='nagy0nmen0rc0n') as mcclient: + with Client(RCON_ADDRESS, 25575, passwd='nagy0nmen0rc0n') as mcclient: response = mcclient.run('authme', 'password', x['mcuser'], request.form['password']) if response != "": @@ -108,7 +109,7 @@ def minecraft_register(**kwargs): return rqtools.get_403(None) db.mc_users.insert_one( {'username': session['username'], 'mcuser': request.form['username']}) - with Client('127.0.0.1', 25575, passwd='nagy0nmen0rc0n') as mcclient: + with Client(RCON_ADDRESS, 25575, passwd='nagy0nmen0rc0n') as mcclient: response = mcclient.run('authme', 'register', request.form['username'], request.form['password']) if response != "": diff --git a/service_plugins/minecraft_admin.py b/service_plugins/minecraft_admin.py index 560b5f5012b432e4ed9d99ce42739dd1e347351c..ad3729b70202ea5f5d29196de15602afd32cb568 100644 --- a/service_plugins/minecraft_admin.py +++ b/service_plugins/minecraft_admin.py @@ -29,7 +29,7 @@ def mcadmin(**kwargs): serverworking = True serverstatus = "" try: - with Client('127.0.0.1', 25575, passwd='nagy0nmen0rc0n') as mcclient: + with Client('172.16.25.100', 25575, passwd='nagy0nmen0rc0n') as mcclient: blacklist = mcclient.run('banlist') except: #return rqtools.get_500(None, errormsg='Could not speak to Minecraft server. Is it running?') @@ -60,7 +60,7 @@ def mcban(**kwargs): if 'player' not in request.args.keys(): return rqtools.get_400(None) try: - with Client('127.0.0.1', 25575, passwd='nagy0nmen0rc0n') as mcclient: + with Client('172.16.25.100', 25575, passwd='nagy0nmen0rc0n') as mcclient: whitelist = mcclient.run('ban', request.args['player']) except: return rqtools.get_500(None, errormsg='Could not deal with Minecraft server.') @@ -78,7 +78,7 @@ def mcunban(**kwargs): if 'player' not in request.args.keys(): return rqtools.get_400(None) try: - with Client('127.0.0.1', 25575, passwd='nagy0nmen0rc0n') as mcclient: + with Client('172.16.25.100', 25575, passwd='nagy0nmen0rc0n') as mcclient: whitelist = mcclient.run('pardon', request.args['player']) except: return rqtools.get_500(None, errormsg='Could not deal with Minecraft server.') @@ -103,7 +103,7 @@ def mcadd(**kwargs): return rqtools.get_400(None, errormsg="This player is already registered by someone.") db.mc_users.insert_one( {'username': username, 'mcuser': username}) - with Client('127.0.0.1', 25575, passwd='nagy0nmen0rc0n') as mcclient: + with Client('172.16.25.100', 25575, passwd='nagy0nmen0rc0n') as mcclient: response = mcclient.run('authme', 'register', username, password) if response != "":