From ed8e6775df2ec77ec9f0f437d7a11a71c65081f4 Mon Sep 17 00:00:00 2001 From: RubenD96 Date: Fri, 23 Apr 2021 15:11:53 +0200 Subject: [PATCH] WhisperHandler reformatting the case of target == null --- .../channel/handlers/WhisperHandler.java | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/net/server/channel/handlers/WhisperHandler.java b/src/main/java/net/server/channel/handlers/WhisperHandler.java index b3d102528d..1d622d16ff 100644 --- a/src/main/java/net/server/channel/handlers/WhisperHandler.java +++ b/src/main/java/net/server/channel/handlers/WhisperHandler.java @@ -49,24 +49,25 @@ public final class WhisperHandler extends AbstractMaplePacketHandler { String name = slea.readMapleAsciiString(); MapleCharacter target = c.getWorldServer().getPlayerStorage().getCharacterByName(name); - if (target != null) { - switch (request) { - case WhisperFlag.LOCATION | WhisperFlag.REQUEST: - handleFind(c.getPlayer(), target, WhisperFlag.LOCATION); - break; - case WhisperFlag.WHISPER | WhisperFlag.REQUEST: - String message = slea.readMapleAsciiString(); - handleWhisper(message, c.getPlayer(), target); - break; - case WhisperFlag.LOCATION_FRIEND | WhisperFlag.REQUEST: - handleFind(c.getPlayer(), target, WhisperFlag.LOCATION_FRIEND); - break; - default: - FilePrinter.printError(FilePrinter.PACKET_HANDLER + c.getPlayer().getName() + ".txt", "Unknown request " + request + " triggered by " + c.getPlayer().getName()); - break; - } - } else { + if (target == null) { c.announce(MaplePacketCreator.getWhisperResult(name, false)); + return; + } + + switch (request) { + case WhisperFlag.LOCATION | WhisperFlag.REQUEST: + handleFind(c.getPlayer(), target, WhisperFlag.LOCATION); + break; + case WhisperFlag.WHISPER | WhisperFlag.REQUEST: + String message = slea.readMapleAsciiString(); + handleWhisper(message, c.getPlayer(), target); + break; + case WhisperFlag.LOCATION_FRIEND | WhisperFlag.REQUEST: + handleFind(c.getPlayer(), target, WhisperFlag.LOCATION_FRIEND); + break; + default: + FilePrinter.printError(FilePrinter.PACKET_HANDLER + c.getPlayer().getName() + ".txt", "Unknown request " + request + " triggered by " + c.getPlayer().getName()); + break; } }