From 3685d662fbd981ac992407bff5ffd7e16556bbe1 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Sun, 28 Sep 2025 16:47:16 +0200 Subject: [PATCH] Hotfix CookieEvents --- .../velocitycore/listeners/CookieEvents.java | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java index 4fb59b62..660ebc87 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java +++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java @@ -31,17 +31,21 @@ public class CookieEvents extends BasicListener { @Subscribe public void handleCookies(CookieReceiveEvent e) { - if (e.getOriginalKey().equals(EventModeListener.EVENT_TO_SPECTATE_KEY)) { - Player player = e.getPlayer(); - SteamwarUser user = SteamwarUser.get(player.getUniqueId()); + System.out.println(e.getOriginalKey() + " " + e.getOriginalData()); + if (!e.getOriginalKey().namespace().equals(EventModeListener.EVENT_TO_SPECTATE_KEY.namespace())) + return; + if (!e.getOriginalKey().value().equals(EventModeListener.EVENT_TO_SPECTATE_KEY.value())) + return; + e.setResult(CookieReceiveEvent.ForwardResult.handled()); + Player player = e.getPlayer(); + SteamwarUser user = SteamwarUser.get(player.getUniqueId()); - EventFight.getActiveFights().stream() - .filter(fight -> fight.getTeamRed() == user.getTeam() || fight.getTeamBlue() == user.getTeam()) - .filter(fight -> fight.getSpectatePort() != null) - .filter(fight -> fight.getSpectatePort() != 0) - .findFirst() - .flatMap(fight -> VelocityCore.getProxy().getServer(EventStarter.getSpectatePorts().get(fight.getSpectatePort()))) - .ifPresent(registeredServer -> player.createConnectionRequest(registeredServer).fireAndForget()); - } + EventFight.getActiveFights().stream() + .filter(fight -> fight.getTeamRed() == user.getTeam() || fight.getTeamBlue() == user.getTeam()) + .filter(fight -> fight.getSpectatePort() != null) + .filter(fight -> fight.getSpectatePort() != 0) + .findFirst() + .flatMap(fight -> VelocityCore.getProxy().getServer(EventStarter.getSpectatePorts().get(fight.getSpectatePort()))) + .ifPresent(registeredServer -> player.createConnectionRequest(registeredServer).fireAndForget()); } }