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

Disconnect client by throwing exception in handler

Browse Source 
This makes it easier to add checks in handlers, which should improve security over time.
I think this approach is more readable and testable than calling Client#disconnect straight up,
while it also decentralizes the handling.
This commit is contained in:
P0nk
2023-08-06 15:48:49 +02:00
parent e9819fac87
commit 2686b2b02d
36 changed files with 180 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java
View File

@@ -28,6 +28,7 @@ import constants.game.GameConstants;
import constants.id.MapId;
import constants.skills.*;
import database.drop.DropProvider;
import net.netty.GameViolationException;
import net.packet.InPacket;
import server.StatEffect;
import tools.PacketCreator;
@@ -56,12 +57,8 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
chr.getAutobanManager().spam(8);*/
AttackInfo attack = parseDamage(p, chr, false, false);
if (chr.getBuffEffect(BuffStat.MORPH) != null) {
if (chr.getBuffEffect(BuffStat.MORPH).isMorphWithoutAttack()) {
// How are they attacking when the client won't let them?
chr.getClient().disconnect(false, false);
return;
}
if (chr.getBuffEffect(BuffStat.MORPH) != null && chr.getBuffEffect(BuffStat.MORPH).isMorphWithoutAttack()) {
throw new GameViolationException("Attempt to attack with morph skill that disallows attacking");
}
if (chr.getDojoEnergy() < 10000 && (attack.skill == 1009 || attack.skill == 10001009 || attack.skill == 20001009)) // PE hacking or maybe just lagging