From 020a21e189bb2224c13800d00b74afd3fd72ed9f Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Fri, 11 Mar 2022 02:46:15 +0800 Subject: [PATCH] fix netplay --- .../forge/gamemodes/net/CObjectInputStream.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/forge-gui/src/main/java/forge/gamemodes/net/CObjectInputStream.java b/forge-gui/src/main/java/forge/gamemodes/net/CObjectInputStream.java index 95d21c52637..69e52e812ea 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/CObjectInputStream.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/CObjectInputStream.java @@ -22,19 +22,10 @@ public class CObjectInputStream extends ObjectInputStream { if (type < 0) { throw new EOFException(); } else { - ObjectStreamClass resultClassDescriptor = super.readClassDescriptor(); - Class localClass; - try { - localClass = Class.forName(resultClassDescriptor.getName()); - } catch (ClassNotFoundException e) { - System.err.println("[Class Not Found Exception]\nNo local class for " + resultClassDescriptor.getName()); - return resultClassDescriptor; - } - ObjectStreamClass localClassDescriptor = ObjectStreamClass.lookupAny(localClass); - if (localClassDescriptor != null && type == 1) { - resultClassDescriptor = localClassDescriptor; // Use local class descriptor for deserialization by default - } - return resultClassDescriptor; + if (type == 0) + return super.readClassDescriptor(); + else + return ObjectStreamClass.lookupAny(classResolver.resolve(readUTF())); } }