Merge branch 'reflectionless' of https://github.com/Anuken/Mindustry

2018-08-31 16:15:43 -04:00
parent 5cb50d57ec 926e61b7cc
commit 565f8a2b4d
3 changed files with 26 additions and 18 deletions
--- a/kryonet/src/io/anuke/kryonet/ByteSerializer.java
+++ b/kryonet/src/io/anuke/kryonet/ByteSerializer.java
@@ -35,9 +35,8 @@ public class ByteSerializer implements Serialization {
        if(id == -2){
           return FrameworkSerializer.read(byteBuffer);
        }else{
-            Class<?> type = Registrator.getByID(id);
            synchronized (packetPoolLock) {
-                Packet packet = (Packet) Pooling.obtain(type);
+                Packet packet = (Packet) Pooling.obtain(Registrator.getByID(id).type);
                packet.read(byteBuffer);
                return packet;
            }