From 30d06b9b08478d3d302586a41178a8a8a5f3bfba Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 8 Jan 2018 20:04:24 -0500
Subject: [PATCH] Fixed crash when connecting to a multiplayer server

---
 .../io/anuke/mindustry/entities/Player.java   |  6 ++--
 .../src/io/anuke/kryonet/KryoRegistrator.java | 30 +------------------
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index 3419dd68d3..12c0bb15b9 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -22,9 +22,9 @@ public class Player extends DestructibleEntity implements Syncable{
 	public String name = "name";
 	public boolean isAndroid;
 
-	public Weapon weaponLeft = Weapon.blaster;
-	public Weapon weaponRight = Weapon.blaster;
-	public Mech mech = Mech.standard;
+	public transient Weapon weaponLeft = Weapon.blaster;
+	public transient Weapon weaponRight = Weapon.blaster;
+	public transient Mech mech = Mech.standard;
 
 	public float angle;
 	public transient float targetAngle = 0f;
diff --git a/kryonet/src/io/anuke/kryonet/KryoRegistrator.java b/kryonet/src/io/anuke/kryonet/KryoRegistrator.java
index e7d2deb624..c09144e4fb 100644
--- a/kryonet/src/io/anuke/kryonet/KryoRegistrator.java
+++ b/kryonet/src/io/anuke/kryonet/KryoRegistrator.java
@@ -1,38 +1,10 @@
 package io.anuke.kryonet;
 
 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 static void register(Kryo kryo){
-        kryo.register(Weapon.class, new Serializer<Weapon>() {
-            @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());
-            }
-        });
+        //TODO register?
     }
 }