Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX][ Фикс модуля ScriptEngine и других мелких багов

Browse source
This commit is contained in:
Gravit 2019-05-04 13:59:42 +07:00
parent 986b3194ec
commit 80c515ea98
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
4 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/ru/gravit/launchserver/websocket/LauncherNettyServer.java
View file

@ -49,7 +49,7 @@ public void initChannel(NioSocketChannel ch) {
pipeline.addLast(new WebSocketFrameHandler()); pipeline.addLast(new WebSocketFrameHandler());
} }
}); });
if(config.proxy.enabled) if(config.proxy != null && config.proxy.enabled)
{ {
LogHelper.info("Connect to main server %s"); LogHelper.info("Connect to main server %s");
Request.service = StandartClientWebSocketService.initWebSockets(config.proxy.address, false); Request.service = StandartClientWebSocketService.initWebSockets(config.proxy.address, false);

2
LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java
View file

@ -116,8 +116,10 @@ public void execute(ChannelHandlerContext ctx, Client clientData) throws Excepti
result.permissions = clientData.permissions; result.permissions = clientData.permissions;
if(getSession) if(getSession)
{ {
if(clientData.session == 0) {
clientData.session = random.nextLong(); clientData.session = random.nextLong();
LaunchServer.server.sessionManager.addClient(clientData); LaunchServer.server.sessionManager.addClient(clientData);
}
result.session = clientData.session; result.session = clientData.session;
} }
if(initProxy) if(initProxy)

12
Launcher/runtime/dialog/dialog.js
View file

@ -240,6 +240,18 @@ function verifyLauncher(e) {
//result.list весь список //result.list весь список
//result.list[0].name имя авторизации(не видно) //result.list[0].name имя авторизации(не видно)
//result.list[0].displayName имя авторизации(видно) //result.list[0].displayName имя авторизации(видно)
result.list.forEach(function(auth_type, i, arr) {
(function() {
//profilesList[serverBtn] = profile;
//var hold = serverBtn;
//var hIndex = index;
//serverBtn.setOnAction(function(event) {
// serverHolder.set(hold);
// settings.profile = hIndex;
//});
authOptions.getItems().add(auth_type.displayName);
})();
});
overlay.swap(0, processing.overlay, function(event) makeProfilesRequest(function(result) { overlay.swap(0, processing.overlay, function(event) makeProfilesRequest(function(result) {
settings.lastProfiles = result.profiles; settings.lastProfiles = result.profiles;
updateProfilesList(result.profiles); updateProfilesList(result.profiles);

2
modules

@ -1 +1 @@
Subproject commit 9e3e773124ced1d3530349a69c21854aa88eaf6b Subproject commit dd587f64151ed253f0a4d0b7e6df5ef71e27bc53