Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bugs with web version connections

Browse Source
This commit is contained in:
Anuken
2018-03-03 17:43:50 -05:00
parent 8c53cf4150
commit 3653135bb0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Sat Mar 03 11:43:34 EST 2018 #Sat Mar 03 12:04:38 EST 2018
version=release version=release
androidBuildCode=331 androidBuildCode=333
name=Mindustry name=Mindustry
code=3.4 code=3.4
build=30 build=30

2
core/src/io/anuke/mindustry/entities/TileEntity.java
View File

@@ -21,8 +21,6 @@ import static io.anuke.mindustry.Vars.tileGroup;
import static io.anuke.mindustry.Vars.world; import static io.anuke.mindustry.Vars.world;
public class TileEntity extends Entity{ public class TileEntity extends Entity{
private static final boolean friendlyFire = true;
public Tile tile; public Tile tile;
public int[] items = new int[Item.getAllItems().size]; public int[] items = new int[Item.getAllItems().size];
public Timer timer; public Timer timer;

6
kryonet/src/io/anuke/kryonet/KryoServer.java
View File

@@ -450,6 +450,8 @@ public class KryoServer implements ServerProvider {
Log.info("&bRecieved web connection: {0} {1}", kn.id, connect.addressTCP); Log.info("&bRecieved web connection: {0} {1}", kn.id, connect.addressTCP);
connections.add(kn); connections.add(kn);
Gdx.app.postRunnable(() -> Net.handleServerReceived(kn.id, connect));
} }
@Override @Override
@@ -462,7 +464,7 @@ public class KryoServer implements ServerProvider {
Disconnect disconnect = new Disconnect(); Disconnect disconnect = new Disconnect();
disconnect.id = k.id; disconnect.id = k.id;
Log.info("&bLost web connection: {0}", k.id); Log.info("&bLost web connection: {0}", k.id);
Net.handleServerReceived(k.id, disconnect); Gdx.app.postRunnable(() -> Net.handleServerReceived(k.id, disconnect));
} }
@Override @Override
@@ -479,7 +481,7 @@ public class KryoServer implements ServerProvider {
byte[] out = Base64Coder.decode(message); byte[] out = Base64Coder.decode(message);
ByteBuffer buffer = ByteBuffer.wrap(out); ByteBuffer buffer = ByteBuffer.wrap(out);
Object o = serializer.read(buffer); Object o = serializer.read(buffer);
Net.handleServerReceived(k.id, o); Gdx.app.postRunnable(() -> Net.handleServerReceived(k.id, o));
} }
}catch (Exception e){ }catch (Exception e){
Log.err(e); Log.err(e);