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

Untested rework of WhisperHandler

Browse Source
This commit is contained in:
RubenD96
2021-04-20 17:25:52 +02:00
parent 28b6dd577a
commit 24cfbcce40
2 changed files with 121 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,121 +26,85 @@ import client.MapleClient;
import client.autoban.AutobanFactory; import client.autoban.AutobanFactory;
import config.YamlConfig; import config.YamlConfig;
import net.AbstractMaplePacketHandler; import net.AbstractMaplePacketHandler;
import net.server.world.World;
import tools.DatabaseConnection;
import tools.FilePrinter; import tools.FilePrinter;
import tools.LogHelper; import tools.LogHelper;
import tools.MaplePacketCreator; import tools.MaplePacketCreator;
import tools.MaplePacketCreator.WhisperFlag;
import tools.data.input.SeekableLittleEndianAccessor; import tools.data.input.SeekableLittleEndianAccessor;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
/** /**
* * @author Chronos
* @author Matze
*/ */
public final class WhisperHandler extends AbstractMaplePacketHandler { public final class WhisperHandler extends AbstractMaplePacketHandler {
// result types, not sure if there are proper names for these
public static final byte RT_ITC = 0x00;
public static final byte RT_SAME_CHANNEL = 0x01;
public static final byte RT_CASH_SHOP = 0x02;
public static final byte RT_DIFFERENT_CHANNEL = 0x03;
@Override @Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) { public void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
byte mode = slea.readByte(); byte request = slea.readByte();
if (mode == 6) { // whisper String name = slea.readMapleAsciiString();
String recipient = slea.readMapleAsciiString(); MapleCharacter target = c.getWorldServer().getPlayerStorage().getCharacterByName(name);
String text = slea.readMapleAsciiString();
MapleCharacter player = c.getChannelServer().getPlayerStorage().getCharacterByName(recipient); if (target != null) {
if (c.getPlayer().getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) { switch (request) {
return; 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;
} }
if (text.length() > Byte.MAX_VALUE && !player.isGM()) {
AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit with whispers.");
FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to send text with length of " + text.length());
c.disconnect(true, false);
return;
}
if (player != null) {
player.getClient().announce(MaplePacketCreator.getWhisper(c.getPlayer().getName(), c.getChannel(), text));
if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
LogHelper.logChat(c, "Whisper To " + player.getName(), text);
}
if(player.isHidden() && player.gmLevel() >= c.getPlayer().gmLevel()) {
c.announce(MaplePacketCreator.getWhisperReply(recipient, (byte) 0));
} else { } else {
c.announce(MaplePacketCreator.getWhisperReply(recipient, (byte) 1)); c.announce(MaplePacketCreator.getWhisperResult(name, false));
}
} else {// not found
World world = c.getWorldServer();
if (world.isConnected(recipient)) {
world.whisper(c.getPlayer().getName(), recipient, c.getChannel(), text);
if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
LogHelper.logChat(c, "Whisper To " + recipient, text);
}
player = world.getPlayerStorage().getCharacterByName(recipient);
if(player.isHidden() && player.gmLevel() >= c.getPlayer().gmLevel())
c.announce(MaplePacketCreator.getWhisperReply(recipient, (byte) 0));
else
c.announce(MaplePacketCreator.getWhisperReply(recipient, (byte) 1));
} else {
c.announce(MaplePacketCreator.getWhisperReply(recipient, (byte) 0));
}
}
c.getPlayer().getAutobanManager().spam(7);
} else if (mode == 5) { // - /find
String recipient = slea.readMapleAsciiString();
MapleCharacter victim = c.getWorldServer().getPlayerStorage().getCharacterByName(recipient);
if (victim != null && c.getPlayer().gmLevel() >= victim.gmLevel()) {
if (victim.getCashShop().isOpened()) { // in CashShop
c.announce(MaplePacketCreator.getFindReply(victim.getName(), -1, 2));
} else if (victim.isAwayFromWorld()) { // in MTS
c.announce(MaplePacketCreator.getFindReply(victim.getName(), -1, 0));
} else if (victim.getClient().getChannel() != c.getChannel()) { // in another channel, issue detected thanks to MedicOP
c.announce(MaplePacketCreator.getFindReply(victim.getName(), victim.getClient().getChannel() - 1, 3));
} else {
c.announce(MaplePacketCreator.getFindReply(victim.getName(), victim.getMap().getId(), 1));
}
} else if (c.getPlayer().isGM()) { // not found
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT gm FROM characters WHERE name = ?")) {
ps.setString(1, recipient);
try (ResultSet rs = ps.executeQuery()) {
if (rs.next()) {
if (rs.getInt("gm") >= c.getPlayer().gmLevel()) {
c.announce(MaplePacketCreator.getWhisperReply(recipient, (byte) 0));
return;
}
} }
} }
byte channel = (byte) (c.getWorldServer().find(recipient) - 1); private void handleFind(MapleCharacter user, MapleCharacter target, byte flag) {
if (channel > -1) { if (user.gmLevel() >= target.gmLevel()) {
c.announce(MaplePacketCreator.getFindReply(recipient, channel, 3)); if (target.getCashShop().isOpened()) {
user.announce(MaplePacketCreator.getFindResult(target, RT_CASH_SHOP, -1, flag));
} else if (target.getClient().getChannel() == user.getClient().getChannel()) {
user.announce(MaplePacketCreator.getFindResult(target, RT_SAME_CHANNEL, target.getMapId(), flag));
} else { } else {
c.announce(MaplePacketCreator.getWhisperReply(recipient, (byte) 0)); user.announce(MaplePacketCreator.getFindResult(target, RT_DIFFERENT_CHANNEL, target.getClient().getChannel(), flag));
}
} catch (SQLException e) {
e.printStackTrace();
} }
} else { } else {
c.announce(MaplePacketCreator.getWhisperReply(recipient, (byte) 0)); // not found for whisper is the same message
user.announce(MaplePacketCreator.getWhisperResult(target.getName(), false));
}
} }
} else if (mode == 0x44) {
//Buddy find, thanks to Atoot
String recipient = slea.readMapleAsciiString(); private void handleWhisper(String message, MapleCharacter user, MapleCharacter target) {
MapleCharacter player = c.getWorldServer().getPlayerStorage().getCharacterByName(recipient); if (user.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
if (player != null && c.getPlayer().gmLevel() >= player.gmLevel()) { return;
if (player.getCashShop().isOpened()) { // in CashShop }
c.announce(MaplePacketCreator.getBuddyFindReply(player.getName(), -1, 2)); user.getAutobanManager().spam(7);
} else if (player.isAwayFromWorld()) { // in MTS
c.announce(MaplePacketCreator.getBuddyFindReply(player.getName(), -1, 0)); if (message.length() > Byte.MAX_VALUE) {
} else if (player.getClient().getChannel() != c.getChannel()) { // in another channel AutobanFactory.PACKET_EDIT.alert(user, user.getName() + " tried to packet edit with whispers.");
c.announce(MaplePacketCreator.getBuddyFindReply(player.getName(), player.getClient().getChannel() - 1, 3)); FilePrinter.printError(FilePrinter.EXPLOITS + user.getName() + ".txt", user.getName() + " tried to send text with length of " + message.length());
} else { user.getClient().disconnect(true, false);
c.announce(MaplePacketCreator.getBuddyFindReply(player.getName(), player.getMap().getId(), 1)); return;
} }
}
} if (YamlConfig.config.server.USE_ENABLE_CHAT_LOG) {
LogHelper.logChat(user.getClient(), "Whisper To " + target.getName(), message);
}
target.announce(MaplePacketCreator.getWhisperReceive(user.getName(), user.getClient().getChannel() - 1, user.isGM(), message));
boolean hidden = target.isHidden() && target.gmLevel() >= user.gmLevel();
user.announce(MaplePacketCreator.getWhisperResult(target.getName(), !hidden));
} }
} }

107
src/main/java/tools/MaplePacketCreator.java
View File

@@ -42,6 +42,7 @@ import net.server.Server;
import net.server.channel.Channel; import net.server.channel.Channel;
import net.server.channel.handlers.PlayerInteractionHandler; import net.server.channel.handlers.PlayerInteractionHandler;
import net.server.channel.handlers.SummonDamageHandler.SummonAttackEntry; import net.server.channel.handlers.SummonDamageHandler.SummonAttackEntry;
import net.server.channel.handlers.WhisperHandler;
import net.server.guild.MapleAlliance; import net.server.guild.MapleAlliance;
import net.server.guild.MapleGuild; import net.server.guild.MapleGuild;
import net.server.guild.MapleGuildCharacter; import net.server.guild.MapleGuildCharacter;
@@ -3661,31 +3662,6 @@ public class MaplePacketCreator {
return pOutPacket.getPacket(); return pOutPacket.getPacket();
} }
public static byte[] getWhisper(String sender, int channel, String text) {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.WHISPER.getValue());
mplew.write(0x12);
mplew.writeMapleAsciiString(sender);
mplew.writeShort(channel - 1); // I guess this is the channel
mplew.writeMapleAsciiString(text);
return mplew.getPacket();
}
/**
*
* @param target name of the target character
* @param reply error code: 0x0 = cannot find char, 0x1 = success
* @return the MaplePacket
*/
public static byte[] getWhisperReply(String target, byte reply) {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.WHISPER.getValue());
mplew.write(0x0A); // whisper?
mplew.writeMapleAsciiString(target);
mplew.write(reply);
return mplew.getPacket();
}
public static byte[] getInventoryFull() { public static byte[] getInventoryFull() {
return modifyInventory(true, Collections.<ModifyInventory>emptyList()); return modifyInventory(true, Collections.<ModifyInventory>emptyList());
} }
@@ -6349,43 +6325,64 @@ public class MaplePacketCreator {
return showCash(mc); return showCash(mc);
} }
/** public static class WhisperFlag {
* public static final byte LOCATION = 0x01;
* @param target public static final byte WHISPER = 0x02;
* @param mapid public static final byte REQUEST = 0x04;
* @param MTSmapCSchannel 0: MTS 1: Map 2: CS 3: Different Channel public static final byte RESULT = 0x08;
* @return public static final byte RECIEVE = 0x10;
*/ public static final byte BLOCKED = 0x20;
public static byte[] getFindReply(String target, int mapid, int MTSmapCSchannel) { public static final byte LOCATION_FRIEND = 0x40;
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.WHISPER.getValue());
mplew.write(9);
mplew.writeMapleAsciiString(target);
mplew.write(MTSmapCSchannel); // 0: mts 1: map 2: cs
mplew.writeInt(mapid); // -1 if mts, cs
if (MTSmapCSchannel == 1) {
mplew.write(new byte[8]);
}
return mplew.getPacket();
} }
/** /**
* User for /find, buddy find and /c (chase)
* CField::OnWhisper
* *
* @param target * @param target Name String from the command parameter
* @param mapid * @param type Location of the target
* @param MTSmapCSchannel 0: MTS 1: Map 2: CS 3: Different Channel * @param fieldOrChannel If true & chr is not null, shows different channel message
* @return * @param flag LOCATION or LOCATION_FRIEND
* @return packet structure
*/ */
public static byte[] getBuddyFindReply(String target, int mapid, int MTSmapCSchannel) { public static byte[] getFindResult(MapleCharacter target, byte type, int fieldOrChannel, byte flag) {
final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter(); MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.WHISPER.getValue()); mplew.writeShort(SendOpcode.WHISPER.getValue());
mplew.write(72);
mplew.writeMapleAsciiString(target); mplew.write(flag | WhisperFlag.RESULT);
mplew.write(MTSmapCSchannel); // 0: mts 1: map 2: cs mplew.writeMapleAsciiString(target.getName());
mplew.writeInt(mapid); // -1 if mts, cs mplew.write(type);
if (MTSmapCSchannel == 1) { mplew.writeInt(fieldOrChannel);
mplew.write(new byte[8]);
if (type == WhisperHandler.RT_SAME_CHANNEL) {
mplew.writeInt(target.getPosition().x);
mplew.writeInt(target.getPosition().y);
} }
return mplew.getPacket();
}
public static byte[] getWhisperResult(String target, boolean success) {
MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.WHISPER.getValue());
mplew.write(WhisperFlag.WHISPER | WhisperFlag.RESULT);
mplew.writeMapleAsciiString(target);
mplew.writeBool(success);
return mplew.getPacket();
}
public static byte[] getWhisperReceive(String sender, int channel, boolean fromAdmin, String message) {
MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
mplew.writeShort(SendOpcode.WHISPER.getValue());
mplew.write(WhisperFlag.WHISPER | WhisperFlag.RECIEVE);
mplew.writeMapleAsciiString(sender);
mplew.write(channel);
mplew.writeBool(fromAdmin);
mplew.writeMapleAsciiString(message);
return mplew.getPacket(); return mplew.getPacket();
} }