From a63a0679b41bad5cceefa76c5a6298d17b9ed1e3 Mon Sep 17 00:00:00 2001 From: UnfamiliarLegacy <74633542+UnfamiliarLegacy@users.noreply.github.com> Date: Sat, 6 Jul 2024 01:31:25 +0200 Subject: [PATCH] Update shockwave version --- .../protocol/connection/proxy/shockwave/ShockwaveProxy.java | 4 ++-- .../java/gearth/services/packet_info/PacketInfoManager.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/G-Earth/src/main/java/gearth/protocol/connection/proxy/shockwave/ShockwaveProxy.java b/G-Earth/src/main/java/gearth/protocol/connection/proxy/shockwave/ShockwaveProxy.java index 611f71e..99ff54e 100644 --- a/G-Earth/src/main/java/gearth/protocol/connection/proxy/shockwave/ShockwaveProxy.java +++ b/G-Earth/src/main/java/gearth/protocol/connection/proxy/shockwave/ShockwaveProxy.java @@ -96,9 +96,9 @@ public class ShockwaveProxy implements ProxyProvider, ConnectionInterceptorCallb final Rc4Obtainer rc4Obtainer = new Rc4Obtainer(hConnection); rc4Obtainer.setFlashPacketHandlers(outgoingHandler, incomingHandler); - // TODO: Non hardcoded version "24". Not exactly sure yet how to deal with this for now. + // TODO: Non hardcoded version "25". Not exactly sure yet how to deal with this for now. // Lets revisit when origins is more mature. - proxy.verifyProxy(incomingHandler, outgoingHandler, "24", "SHOCKWAVE"); + proxy.verifyProxy(incomingHandler, outgoingHandler, "25", "SHOCKWAVE"); hProxySetter.setProxy(proxy); onConnect(); diff --git a/G-Earth/src/main/java/gearth/services/packet_info/PacketInfoManager.java b/G-Earth/src/main/java/gearth/services/packet_info/PacketInfoManager.java index 81e2b79..586757e 100644 --- a/G-Earth/src/main/java/gearth/services/packet_info/PacketInfoManager.java +++ b/G-Earth/src/main/java/gearth/services/packet_info/PacketInfoManager.java @@ -117,7 +117,9 @@ public class PacketInfoManager { } else if (clientType == HClient.FLASH || clientType == HClient.NITRO || clientType == HClient.SHOCKWAVE) { try { List providers = new ArrayList<>(); - providers.add(new HarblePacketInfoProvider(hotelversion)); + if (clientType != HClient.SHOCKWAVE) { + providers.add(new HarblePacketInfoProvider(hotelversion)); + } providers.add(new SulekPacketInfoProvider(clientType, hotelversion)); Semaphore blockUntilComplete = new Semaphore(providers.size());