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

Fixed crash when connecting to a multiplayer server

Browse Source
This commit is contained in:
Anuken
2018-01-08 20:04:24 -05:00
parent 530505c3a0
commit 30d06b9b08
2 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/entities/Player.java
View File

@@ -22,9 +22,9 @@ public class Player extends DestructibleEntity implements Syncable{
public String name = "name"; public String name = "name";
public boolean isAndroid; public boolean isAndroid;
public Weapon weaponLeft = Weapon.blaster; public transient Weapon weaponLeft = Weapon.blaster;
public Weapon weaponRight = Weapon.blaster; public transient Weapon weaponRight = Weapon.blaster;
public Mech mech = Mech.standard; public transient Mech mech = Mech.standard;
public float angle; public float angle;
public transient float targetAngle = 0f; public transient float targetAngle = 0f;

30
kryonet/src/io/anuke/kryonet/KryoRegistrator.java
View File

@@ -1,38 +1,10 @@
package io.anuke.kryonet; package io.anuke.kryonet;
import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Kryo;
import com.esotericsoftware.kryo.Serializer;
import com.esotericsoftware.kryo.io.Input;
import com.esotericsoftware.kryo.io.Output;
import io.anuke.mindustry.resource.Mech;
import io.anuke.mindustry.resource.Upgrade;
import io.anuke.mindustry.resource.Weapon;
public class KryoRegistrator { public class KryoRegistrator {
public static void register(Kryo kryo){ public static void register(Kryo kryo){
kryo.register(Weapon.class, new Serializer<Weapon>() { //TODO register?
@Override
public void write(Kryo kryo, Output output, Weapon object) {
output.writeByte(object.id);
}
@Override
public Weapon read(Kryo kryo, Input input, Class type) {
return (Weapon)Upgrade.getByID(input.readByte());
}
});
kryo.register(Mech.class, new Serializer<Mech>() {
@Override
public void write(Kryo kryo, Output output, Mech object) {
output.writeByte(object.id);
}
@Override
public Mech read(Kryo kryo, Input input, Class type) {
return (Mech)Upgrade.getByID(input.readByte());
}
});
} }
} }