Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WhisperHandler reformatting the case of target == null

Browse Source
This commit is contained in:
RubenD96
2021-04-23 15:11:53 +02:00
parent ade50bad5e
commit ed8e6775df
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/net/server/channel/handlers/WhisperHandler.java
View File

@@ -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;
}
}