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

AutoAggro & MoveLife handler update + minor patches

Browse Source 
Changed some handlers to reuse MapleMap variable, preventing some minor inconsistencies.
Applied minor patches over the source.
This commit is contained in:
ronancpl
2018-01-11 12:29:43 -02:00
parent 1190513d0c
commit c4c3f58f41
10 changed files with 119 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/MapleCharacter.java
View File

@@ -3858,12 +3858,13 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
}
public int getFh() {
Point pos = this.getPosition();
pos.y -= 6;
if (getMap().getFootholds().findBelow(pos) == null) {
Point pos = this.getPosition();
pos.y -= 6;
if (map.getFootholds().findBelow(pos) == null) {
return 0;
} else {
return getMap().getFootholds().findBelow(pos).getY1();
return map.getFootholds().findBelow(pos).getY1();
}
}

8
src/net/server/channel/handlers/AbstractDealDamageHandler.java
View File

@@ -240,16 +240,16 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
if(attack.skill == Aran.COMBO_SMASH || attack.skill == Aran.BODY_PRESSURE)
distanceToDetect += 40000;
if(attack.skill == Bishop.GENESIS || attack.skill == ILArchMage.BLIZZARD || attack.skill == FPArchMage.METEOR_SHOWER)
else if(attack.skill == Bishop.GENESIS || attack.skill == ILArchMage.BLIZZARD || attack.skill == FPArchMage.METEOR_SHOWER)
distanceToDetect += 275000;
if(attack.skill == Hero.BRANDISH || attack.skill == DragonKnight.SPEAR_CRUSHER || attack.skill == DragonKnight.POLE_ARM_CRUSHER);
else if(attack.skill == Hero.BRANDISH || attack.skill == DragonKnight.SPEAR_CRUSHER || attack.skill == DragonKnight.POLE_ARM_CRUSHER)
distanceToDetect += 40000;
if(attack.skill == DragonKnight.DRAGON_ROAR || attack.skill == SuperGM.SUPER_DRAGON_ROAR)
else if(attack.skill == DragonKnight.DRAGON_ROAR || attack.skill == SuperGM.SUPER_DRAGON_ROAR)
distanceToDetect += 250000;
if(attack.skill == Shadower.BOOMERANG_STEP)
else if(attack.skill == Shadower.BOOMERANG_STEP)
distanceToDetect += 60000;
if(distance > distanceToDetect) {

28
src/net/server/channel/handlers/AutoAggroHandler.java
View File

@@ -24,30 +24,34 @@ package net.server.channel.handlers;
import client.MapleClient;
import net.AbstractMaplePacketHandler;
import server.life.MapleMonster;
import server.maps.MapleMap;
import tools.data.input.SeekableLittleEndianAccessor;
public final class AutoAggroHandler extends AbstractMaplePacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
int oid = slea.readInt();
MapleMonster monster = c.getPlayer().getMap().getMonsterByOid(oid);
if(c.getPlayer().isHidden())
return; // Don't auto aggro GM's in hide...
if (monster != null && monster.getController() != null) {
if (!monster.isControllerHasAggro()) {
if (c.getPlayer().getMap().getCharacterById(monster.getController().getId()) == null) {
MapleMap map = c.getPlayer().getMap();
int oid = slea.readInt();
try {
MapleMonster monster = map.getMonsterByOid(oid);
if (monster != null && monster.getController() != null) {
if (!monster.isControllerHasAggro()) {
if (map.getCharacterById(monster.getController().getId()) == null) {
monster.switchController(c.getPlayer(), true);
} else {
monster.switchController(monster.getController(), true);
}
} else if (map.getCharacterById(monster.getController().getId()) == null) {
monster.switchController(c.getPlayer(), true);
} else {
monster.switchController(monster.getController(), true);
}
} else if (c.getPlayer().getMap().getCharacterById(monster.getController().getId()) == null) {
} else if (monster != null && monster.getController() == null) {
monster.switchController(c.getPlayer(), true);
}
} else if (monster != null && monster.getController() == null) {
monster.switchController(c.getPlayer(), true);
}
} catch(NullPointerException npe) {}
}
}

127
src/net/server/channel/handlers/MoveLifeHandler.java
View File

@@ -29,6 +29,7 @@ import java.util.List;
import server.life.MapleMonster;
import server.life.MobSkill;
import server.life.MobSkillFactory;
import server.maps.MapleMap;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import server.movement.LifeMovementFragment;
@@ -40,72 +41,76 @@ import tools.data.input.SeekableLittleEndianAccessor;
public final class MoveLifeHandler extends AbstractMovementPacketHandler {
@Override
public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
MapleMap map = c.getPlayer().getMap();
List<MapleCharacter> banishPlayers = new ArrayList<>();
int objectid = slea.readInt();
short moveid = slea.readShort();
MapleMapObject mmo = c.getPlayer().getMap().getMapObject(objectid);
if (mmo == null || mmo.getType() != MapleMapObjectType.MONSTER) {
return;
}
MapleMonster monster = (MapleMonster) mmo;
List<LifeMovementFragment> res;
byte skillByte = slea.readByte();
byte skill = slea.readByte();
int skill_1 = slea.readByte() & 0xFF;
byte skill_2 = slea.readByte();
byte skill_3 = slea.readByte();
byte skill_4 = slea.readByte();
slea.read(8);
MobSkill toUse = null;
if (skillByte == 1 && monster.getNoSkills() > 0) {
int random = Randomizer.nextInt(monster.getNoSkills());
Pair<Integer, Integer> skillToUse = monster.getSkills().get(random);
toUse = MobSkillFactory.getMobSkill(skillToUse.getLeft(), skillToUse.getRight());
int percHpLeft = (monster.getHp() / monster.getMaxHp()) * 100;
if (toUse.getHP() < percHpLeft || !monster.canUseSkill(toUse)) {
toUse = null;
}
}
if ((skill_1 >= 100 && skill_1 <= 200) && monster.hasSkill(skill_1, skill_2)) {
MobSkill skillData = MobSkillFactory.getMobSkill(skill_1, skill_2);
if (skillData != null && monster.canUseSkill(skillData)) {
skillData.applyEffect(c.getPlayer(), monster, true, banishPlayers);
}
}
slea.readByte();
slea.readInt(); // whatever
short start_x = slea.readShort(); // hmm.. startpos?
short start_y = slea.readShort(); // hmm...
Point startPos = new Point(start_x, start_y);
res = parseMovement(slea);
if (monster.getController() != c.getPlayer()) {
if (monster.isAttackedBy(c.getPlayer())) {// aggro and controller change
monster.switchController(c.getPlayer(), true);
} else {
try {
MapleMapObject mmo = map.getMapObject(objectid);
if (mmo == null || mmo.getType() != MapleMapObjectType.MONSTER) {
return;
}
} else if (skill == -1 && monster.isControllerKnowsAboutAggro() && !monster.isMobile() && !monster.isFirstAttack()) {
monster.setControllerHasAggro(false);
monster.setControllerKnowsAboutAggro(false);
}
boolean aggro = monster.isControllerHasAggro();
if (toUse != null) {
c.announce(MaplePacketCreator.moveMonsterResponse(objectid, moveid, monster.getMp(), aggro, toUse.getSkillId(), toUse.getSkillLevel()));
} else {
c.announce(MaplePacketCreator.moveMonsterResponse(objectid, moveid, monster.getMp(), aggro));
}
if (aggro) {
monster.setControllerKnowsAboutAggro(true);
}
if (res != null) {
c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.moveMonster(skillByte, skill, skill_1, skill_2, skill_3, skill_4, objectid, startPos, res), monster.getPosition());
updatePosition(res, monster, -1);
c.getPlayer().getMap().moveMonster(monster, monster.getPosition());
}
for (MapleCharacter chr : banishPlayers) {
chr.changeMapBanish(monster.getBanish().getMap(), monster.getBanish().getPortal(), monster.getBanish().getMsg());
}
MapleMonster monster = (MapleMonster) mmo;
List<LifeMovementFragment> res;
byte skillByte = slea.readByte();
byte skill = slea.readByte();
int skill_1 = slea.readByte() & 0xFF;
byte skill_2 = slea.readByte();
byte skill_3 = slea.readByte();
byte skill_4 = slea.readByte();
slea.read(8);
MobSkill toUse = null;
if (skillByte == 1 && monster.getNoSkills() > 0) {
int random = Randomizer.nextInt(monster.getNoSkills());
Pair<Integer, Integer> skillToUse = monster.getSkills().get(random);
toUse = MobSkillFactory.getMobSkill(skillToUse.getLeft(), skillToUse.getRight());
int percHpLeft = (monster.getHp() / monster.getMaxHp()) * 100;
if (toUse.getHP() < percHpLeft || !monster.canUseSkill(toUse)) {
toUse = null;
}
}
if ((skill_1 >= 100 && skill_1 <= 200) && monster.hasSkill(skill_1, skill_2)) {
MobSkill skillData = MobSkillFactory.getMobSkill(skill_1, skill_2);
if (skillData != null && monster.canUseSkill(skillData)) {
skillData.applyEffect(c.getPlayer(), monster, true, banishPlayers);
}
}
slea.readByte();
slea.readInt(); // whatever
short start_x = slea.readShort(); // hmm.. startpos?
short start_y = slea.readShort(); // hmm...
Point startPos = new Point(start_x, start_y);
res = parseMovement(slea);
if (monster.getController() != c.getPlayer()) {
if (monster.isAttackedBy(c.getPlayer())) {// aggro and controller change
monster.switchController(c.getPlayer(), true);
} else {
return;
}
} else if (skill == -1 && monster.isControllerKnowsAboutAggro() && !monster.isMobile() && !monster.isFirstAttack()) {
monster.setControllerHasAggro(false);
monster.setControllerKnowsAboutAggro(false);
}
boolean aggro = monster.isControllerHasAggro();
if (toUse != null) {
c.announce(MaplePacketCreator.moveMonsterResponse(objectid, moveid, monster.getMp(), aggro, toUse.getSkillId(), toUse.getSkillLevel()));
} else {
c.announce(MaplePacketCreator.moveMonsterResponse(objectid, moveid, monster.getMp(), aggro));
}
if (aggro) {
monster.setControllerKnowsAboutAggro(true);
}
if (res != null) {
map.broadcastMessage(c.getPlayer(), MaplePacketCreator.moveMonster(skillByte, skill, skill_1, skill_2, skill_3, skill_4, objectid, startPos, res), monster.getPosition());
updatePosition(res, monster, -1);
map.moveMonster(monster, monster.getPosition());
}
for (MapleCharacter chr : banishPlayers) {
chr.changeMapBanish(monster.getBanish().getMap(), monster.getBanish().getPortal(), monster.getBanish().getMsg());
}
} catch(NullPointerException npe) {}
}
}