mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 03:08:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Crash fixes

Browse Source
This commit is contained in:
Anuken 2018-07-03 12:27:37 -04:00
parent e56d865416
commit c9b77e4e23
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -27,7 +27,7 @@ allprojects {
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
aiVersion = '1.8.1' aiVersion = '1.8.1'
uCoreVersion = 'bc1c2e0848' uCoreVersion = '5f35012fef'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

2
core/src/io/anuke/mindustry/core/NetServer.java
View File

@ -457,7 +457,7 @@ public class NetServer extends Module{
} }
} }
private static void onDisconnect(Player player){ public static void onDisconnect(Player player){
Call.sendMessage("[accent]" + player.name + " has disconnected."); Call.sendMessage("[accent]" + player.name + " has disconnected.");
Call.onPlayerDisconnect(player.id); Call.onPlayerDisconnect(player.id);
player.remove(); player.remove();

2
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@ -313,7 +313,7 @@ public class DesktopInput extends InputHandler{
float ya = Inputs.getAxis(section, "cursor_y"); float ya = Inputs.getAxis(section, "cursor_y");
if(Math.abs(xa) > controllerMin || Math.abs(ya) > controllerMin) { if(Math.abs(xa) > controllerMin || Math.abs(ya) > controllerMin) {
float scl = Settings.getInt("sensitivity")/100f * Unit.dp.scl(1f); float scl = Settings.getInt("sensitivity", 100)/100f * Unit.dp.scl(1f);
controlx += xa*baseControllerSpeed*scl; controlx += xa*baseControllerSpeed*scl;
controly -= ya*baseControllerSpeed*scl; controly -= ya*baseControllerSpeed*scl;
controlling = true; controlling = true;

2
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@ -322,7 +322,7 @@ public class MobileInput extends InputHandler implements GestureListener{
for(PlaceRequest request : selection){ for(PlaceRequest request : selection){
Tile tile = request.tile(); Tile tile = request.tile();
if(tile == null) continue; if(tile == null || recipe == null) continue;
if ((!request.remove && validPlace(tile.x, tile.y, request.recipe.result, request.rotation)) if ((!request.remove && validPlace(tile.x, tile.y, request.recipe.result, request.rotation))
|| (request.remove && validBreak(tile.x, tile.y))) { || (request.remove && validBreak(tile.x, tile.y))) {

5
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@ -220,6 +220,11 @@ public class ServerControl extends Module {
if(playerGroup.size() > 0) { if(playerGroup.size() > 0) {
info("&lyPlayers: {0}", playerGroup.size()); info("&lyPlayers: {0}", playerGroup.size());
for (Player p : playerGroup.all()) { for (Player p : playerGroup.all()) {
//TODO
if(Net.getConnection(p.clientid) == null){
netServer.onDisconnect(p);
continue;
}
print(" &y{0} / Connection {1} / IP: {2}", p.name, p.clientid, Net.getConnection(p.clientid).address); print(" &y{0} / Connection {1} / IP: {2}", p.name, p.clientid, Net.getConnection(p.clientid).address);
} }
}else{ }else{