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

Rename and clean up MapleMonster

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:06:11 +02:00
parent 38c700ca48
commit 02786eab63
42 changed files with 520 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java
View File

@@ -184,7 +184,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
}
}
for (Integer oned : attack.allDamage.keySet()) {
final MapleMonster monster = map.getMonsterByOid(oned);
final Monster monster = map.getMonsterByOid(oned);
if (monster != null) {
double distance = player.getPosition().distanceSq(monster.getPosition());
double distanceToDetect = 200000.0;
@@ -508,7 +508,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
}
}
private static void damageMonsterWithSkill(final Character attacker, final MapleMap map, final MapleMonster monster, final int damage, int skillid, int fixedTime) {
private static void damageMonsterWithSkill(final Character attacker, final MapleMap map, final Monster monster, final int damage, int skillid, int fixedTime) {
int animationTime;
if(fixedTime == 0) animationTime = SkillFactory.getSkill(skillid).getAnimationTime();
@@ -743,7 +743,7 @@ public abstract class AbstractDealDamageHandler extends AbstractPacketHandler {
int oid = p.readInt();
p.skip(14);
List<Integer> allDamageNumbers = new ArrayList<>();
MapleMonster monster = chr.getMap().getMonsterByOid(oid);
Monster monster = chr.getMap().getMonsterByOid(oid);
if(chr.getBuffEffect(BuffStat.WK_CHARGE) != null) {
// Charge, so now we need to check elemental effectiveness

6
src/main/java/net/server/channel/handlers/AdminCommandHandler.java
View File

@@ -30,7 +30,7 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.life.LifeFactory;
import server.life.MapleMonster;
import server.life.Monster;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import server.quest.MapleQuest;
@@ -128,7 +128,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
int amount = p.readInt();
List<MapleMapObject> monsterx = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));
for (int x = 0; x < amount; x++) {
MapleMonster monster = (MapleMonster) monsterx.get(x);
Monster monster = (Monster) monsterx.get(x);
if (monster.getId() == mobToKill) {
c.getPlayer().getMap().killMonster(monster, c.getPlayer(), true);
}
@@ -149,7 +149,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
c.getPlayer().dropMessage("Monsters HP");
List<MapleMapObject> monsters = c.getPlayer().getMap().getMapObjectsInRange(c.getPlayer().getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));
for (MapleMapObject mobs : monsters) {
MapleMonster monster = (MapleMonster) mobs;
Monster monster = (Monster) mobs;
if (monster.getId() == mobHp) {
c.getPlayer().dropMessage(monster.getName() + ": " + monster.getHp());
}

4
src/main/java/net/server/channel/handlers/AutoAggroHandler.java
View File

@@ -25,7 +25,7 @@ import client.Character;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.life.MapleMonster;
import server.life.Monster;
import server.maps.MapleMap;
public final class AutoAggroHandler extends AbstractPacketHandler {
@@ -38,7 +38,7 @@ public final class AutoAggroHandler extends AbstractPacketHandler {
MapleMap map = player.getMap();
int oid = p.readInt();
MapleMonster monster = map.getMonsterByOid(oid);
Monster monster = map.getMonsterByOid(oid);
if (monster != null) {
monster.aggroAutoAggroUpdate(player);
}

4
src/main/java/net/server/channel/handlers/FieldDamageMobHandler.java
View File

@@ -24,8 +24,8 @@ import client.Client;
import constants.game.GameConstants;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.life.MapleMonster;
import server.life.MapleMonsterInformationProvider;
import server.life.Monster;
import server.maps.MapleMap;
import tools.FilePrinter;
import tools.PacketCreator;
@@ -45,7 +45,7 @@ public class FieldDamageMobHandler extends AbstractPacketHandler {
return;
}
MapleMonster mob = map.getMonsterByOid(mobOid);
Monster mob = map.getMonsterByOid(mobOid);
if (mob != null) {
if (dmg < 0 || dmg > GameConstants.MAX_FIELD_MOB_DAMAGE) {
FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to use an obstacle on mapid " + map.getId() + " to attack " + MapleMonsterInformationProvider.getInstance().getMobNameFromId(mob.getId()) + " with damage " + dmg);

4
src/main/java/net/server/channel/handlers/MobBanishPlayerHandler.java
View File

@@ -24,7 +24,7 @@ import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.life.LifeFactory.BanishInfo;
import server.life.MapleMonster;
import server.life.Monster;
public final class MobBanishPlayerHandler extends AbstractPacketHandler {
@@ -33,7 +33,7 @@ public final class MobBanishPlayerHandler extends AbstractPacketHandler {
int mobid = p.readInt(); // mob banish handling detected thanks to MedicOP
Character chr = c.getPlayer();
MapleMonster mob = chr.getMap().getMonsterById(mobid);
Monster mob = chr.getMap().getMonsterById(mobid);
if (mob != null) {
BanishInfo banishInfo = mob.getBanish();

4
src/main/java/net/server/channel/handlers/MobDamageMobFriendlyHandler.java
View File

@@ -25,7 +25,7 @@ import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import scripting.event.EventInstanceManager;
import server.life.MapleMonster;
import server.life.Monster;
import server.maps.MapleMap;
import tools.PacketCreator;
import tools.Randomizer;
@@ -43,7 +43,7 @@ public final class MobDamageMobFriendlyHandler extends AbstractPacketHandler {
int damaged = p.readInt();
MapleMap map = c.getPlayer().getMap();
MapleMonster monster = map.getMonsterByOid(damaged);
Monster monster = map.getMonsterByOid(damaged);
if (monster == null || map.getMonsterByOid(attacker) == null) {
return;

10
src/main/java/net/server/channel/handlers/MobDamageMobHandler.java
View File

@@ -28,8 +28,8 @@ import client.status.MonsterStatus;
import client.status.MonsterStatusEffect;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.life.MapleMonster;
import server.life.MapleMonsterInformationProvider;
import server.life.Monster;
import server.maps.MapleMap;
import tools.FilePrinter;
import tools.PacketCreator;
@@ -52,8 +52,8 @@ public final class MobDamageMobHandler extends AbstractPacketHandler {
Character chr = c.getPlayer();
MapleMap map = chr.getMap();
MapleMonster attacker = map.getMonsterByOid(from);
MapleMonster damaged = map.getMonsterByOid(to);
Monster attacker = map.getMonsterByOid(from);
Monster damaged = map.getMonsterByOid(to);
if (attacker != null && damaged != null) {
int maxDmg = calcMaxDamage(attacker, damaged, magic); // thanks Darter (YungMoozi) for reporting unchecked dmg
@@ -70,7 +70,7 @@ public final class MobDamageMobHandler extends AbstractPacketHandler {
}
}
private static int calcMaxDamage(MapleMonster attacker, MapleMonster damaged, boolean magic) {
private static int calcMaxDamage(Monster attacker, Monster damaged, boolean magic) {
int attackerAtk, damagedDef, attackerLevel = attacker.getLevel();
double maxDamage;
if (magic) {
@@ -94,7 +94,7 @@ public final class MobDamageMobHandler extends AbstractPacketHandler {
return (int) maxDamage;
}
private static int calcModifier(MapleMonster monster, MonsterStatus buff, MonsterStatus nerf) {
private static int calcModifier(Monster monster, MonsterStatus buff, MonsterStatus nerf) {
int atkModifier;
final Map<MonsterStatus, MonsterStatusEffect> monsterStati = monster.getStati();

4
src/main/java/net/server/channel/handlers/MonsterBombHandler.java
View File

@@ -24,14 +24,14 @@ package net.server.channel.handlers;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.life.MapleMonster;
import server.life.Monster;
import tools.PacketCreator;
public final class MonsterBombHandler extends AbstractPacketHandler {
@Override
public final void handlePacket(InPacket p, Client c) {
int oid = p.readInt();
MapleMonster monster = c.getPlayer().getMap().getMonsterByOid(oid);
Monster monster = c.getPlayer().getMap().getMonsterByOid(oid);
if (!c.getPlayer().isAlive() || monster == null) {
return;
}

4
src/main/java/net/server/channel/handlers/MonsterCarnivalHandler.java
View File

@@ -29,7 +29,7 @@ import net.packet.InPacket;
import net.server.world.Party;
import net.server.world.PartyCharacter;
import server.life.LifeFactory;
import server.life.MapleMonster;
import server.life.Monster;
import server.partyquest.MapleCarnivalFactory;
import server.partyquest.MapleCarnivalFactory.MCSkill;
import server.partyquest.MonsterCarnival;
@@ -62,7 +62,7 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler {
return;
}
final MapleMonster mob = LifeFactory.getMonster(mobs.get(num).left);
final Monster mob = LifeFactory.getMonster(mobs.get(num).left);
MonsterCarnival mcpq = c.getPlayer().getMonsterCarnival();
if (mcpq != null) {
if (!mcpq.canSummonR() && c.getPlayer().getTeam() == 0 || !mcpq.canSummonB() && c.getPlayer().getTeam() == 1) {

4
src/main/java/net/server/channel/handlers/MoveLifeHandler.java
View File

@@ -25,10 +25,10 @@ import client.Character;
import client.Client;
import config.YamlConfig;
import net.packet.InPacket;
import server.life.MapleMonster;
import server.life.MapleMonsterInformationProvider;
import server.life.MobSkill;
import server.life.MobSkillFactory;
import server.life.Monster;
import server.maps.MapleMap;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
@@ -64,7 +64,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
return;
}
MapleMonster monster = (MapleMonster) mmo;
Monster monster = (Monster) mmo;
List<Character> banishPlayers = null;
byte pNibbles = p.readByte();

4
src/main/java/net/server/channel/handlers/PlayerMapTransitionHandler.java
View File

@@ -25,7 +25,7 @@ import client.Character;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.life.MapleMonster;
import server.life.Monster;
import server.maps.MapleMapObject;
import tools.PacketCreator;
import tools.Pair;
@@ -54,7 +54,7 @@ public final class PlayerMapTransitionHandler extends AbstractPacketHandler {
if (!chr.isHidden()) { // thanks Lame (Conrad) for noticing hidden characters controlling mobs
for (MapleMapObject mo : chr.getMap().getMonsters()) { // thanks BHB, IxianMace, Jefe for noticing several issues regarding mob statuses (such as freeze)
MapleMonster m = (MapleMonster) mo;
Monster m = (Monster) mo;
if (m.getSpawnEffect() == 0 || m.getHp() < m.getMaxHp()) { // avoid effect-spawning mobs
if (m.getController() == chr) {
c.sendPacket(PacketCreator.stopControllingMonster(m.getObjectId()));

4
src/main/java/net/server/channel/handlers/SpecialMoveHandler.java
View File

@@ -31,7 +31,7 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import server.MapleStatEffect;
import server.life.MapleMonster;
import server.life.Monster;
import tools.PacketCreator;
import java.awt.*;
@@ -89,7 +89,7 @@ public final class SpecialMoveHandler extends AbstractPacketHandler {
int mobOid = p.readInt();
byte success = p.readByte();
chr.getMap().broadcastMessage(chr, PacketCreator.catchMonster(mobOid, success), false);
MapleMonster monster = chr.getMap().getMonsterByOid(mobOid);
Monster monster = chr.getMap().getMonsterByOid(mobOid);
if (monster != null) {
if (!monster.isBoss()) {
monster.aggroClearDamages();

4
src/main/java/net/server/channel/handlers/SummonDamageHandler.java
View File

@@ -34,8 +34,8 @@ import constants.skills.Outlaw;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.MapleStatEffect;
import server.life.MapleMonster;
import server.life.MapleMonsterInformationProvider;
import server.life.Monster;
import server.maps.MapleSummon;
import tools.FilePrinter;
import tools.PacketCreator;
@@ -104,7 +104,7 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler {
int maxDmg = calcMaxDamage(summonEffect, player, magic); // thanks Darter (YungMoozi) for reporting unchecked max dmg
for (SummonAttackEntry attackEntry : allDamage) {
int damage = attackEntry.getDamage();
MapleMonster target = player.getMap().getMonsterByOid(attackEntry.getMonsterOid());
Monster target = player.getMap().getMonsterByOid(attackEntry.getMonsterOid());
if (target != null) {
if (damage > maxDmg) {
AutobanFactory.DAMAGE_HACK.alert(c.getPlayer(), "Possible packet editing summon damage exploit.");

6
src/main/java/net/server/channel/handlers/TakeDamageHandler.java
View File

@@ -64,7 +64,7 @@ public final class TakeDamageHandler extends AbstractPacketHandler {
int pos_x = 0, pos_y = 0, fake = 0;
boolean is_pgmr = false, is_pg = true, is_deadly = false;
int mpattack = 0;
MapleMonster attacker = null;
Monster attacker = null;
final MapleMap map = chr.getMap();
if (damagefrom != -3 && damagefrom != -4) {
monsteridfrom = p.readInt();
@@ -72,8 +72,8 @@ public final class TakeDamageHandler extends AbstractPacketHandler {
try {
MapleMapObject mmo = map.getMapObject(oid);
if(mmo instanceof MapleMonster) {
attacker = (MapleMonster) mmo;
if(mmo instanceof Monster) {
attacker = (Monster) mmo;
if(attacker.getId() != monsteridfrom) {
attacker = null;
}

4
src/main/java/net/server/channel/handlers/UseCatchItemHandler.java
View File

@@ -31,7 +31,7 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import server.MapleItemInformationProvider;
import server.life.MapleMonster;
import server.life.Monster;
import tools.PacketCreator;
/**
@@ -49,7 +49,7 @@ public final class UseCatchItemHandler extends AbstractPacketHandler {
int itemId = p.readInt();
int monsterid = p.readInt();
MapleMonster mob = chr.getMap().getMonsterByOid(monsterid);
Monster mob = chr.getMap().getMonsterByOid(monsterid);
if (chr.getInventory(ItemConstants.getInventoryType(itemId)).countById(itemId) <= 0) {
return;
}

18
src/main/java/net/server/coordinator/world/MonsterAggroCoordinator.java
View File

@@ -27,7 +27,7 @@ import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
import server.TimerManager;
import server.life.MapleMonster;
import server.life.Monster;
import server.maps.MapleMap;
import tools.Pair;
@@ -46,8 +46,8 @@ public class MonsterAggroCoordinator {
private ScheduledFuture<?> aggroMonitor = null;
private final Map<MapleMonster, Map<Integer, PlayerAggroEntry>> mobAggroEntries = new HashMap<>();
private final Map<MapleMonster, List<PlayerAggroEntry>> mobSortedAggros = new HashMap<>();
private final Map<Monster, Map<Integer, PlayerAggroEntry>> mobAggroEntries = new HashMap<>();
private final Map<Monster, List<PlayerAggroEntry>> mobSortedAggros = new HashMap<>();
private final Set<Integer> mapPuppetEntries = new HashSet<>();
@@ -144,7 +144,7 @@ public class MonsterAggroCoordinator {
}
}
public void addAggroDamage(MapleMonster mob, int cid, int damage) { // assumption: should not trigger after dispose()
public void addAggroDamage(Monster mob, int cid, int damage) { // assumption: should not trigger after dispose()
if (!mob.isAlive()) {
return;
}
@@ -196,17 +196,17 @@ public class MonsterAggroCoordinator {
}
private void runAggroUpdate(int deltaTime) {
List<Pair<MapleMonster, Map<Integer, PlayerAggroEntry>>> aggroMobs = new LinkedList<>();
List<Pair<Monster, Map<Integer, PlayerAggroEntry>>> aggroMobs = new LinkedList<>();
lock.lock();
try {
for (Entry<MapleMonster, Map<Integer, PlayerAggroEntry>> e : mobAggroEntries.entrySet()) {
for (Entry<Monster, Map<Integer, PlayerAggroEntry>> e : mobAggroEntries.entrySet()) {
aggroMobs.add(new Pair<>(e.getKey(), e.getValue()));
}
} finally {
lock.unlock();
}
for (Pair<MapleMonster, Map<Integer, PlayerAggroEntry>> am : aggroMobs) {
for (Pair<Monster, Map<Integer, PlayerAggroEntry>> am : aggroMobs) {
Map<Integer, PlayerAggroEntry> mobAggro = am.getRight();
List<PlayerAggroEntry> sortedAggro = mobSortedAggros.get(am.getLeft());
@@ -289,7 +289,7 @@ public class MonsterAggroCoordinator {
}
}
public boolean isLeadingCharacterAggro(MapleMonster mob, Character player) {
public boolean isLeadingCharacterAggro(Monster mob, Character player) {
if (mob.isLeadingPuppetInVicinity()) {
return false;
} else if (mob.isCharacterPuppetInVicinity(player)) {
@@ -337,7 +337,7 @@ public class MonsterAggroCoordinator {
}
}
public void removeAggroEntries(MapleMonster mob) {
public void removeAggroEntries(Monster mob) {
lock.lock();
try {
mobAggroEntries.remove(mob);