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

18
src/main/java/client/Character.java
View File

@@ -63,10 +63,10 @@ import server.events.Events;
import server.events.RescueGaga;
import server.events.gm.Fitness;
import server.events.gm.Ola;
import server.life.MapleMonster;
import server.life.MaplePlayerNPC;
import server.life.MobSkill;
import server.life.MobSkillFactory;
import server.life.Monster;
import server.maps.*;
import server.maps.MapleMiniGame.MiniGameResult;
import server.minigame.MapleRockPaperScissor;
@@ -177,7 +177,7 @@ public class Character extends AbstractCharacterObject {
private final List<WeakReference<MapleMap>> lastVisitedMaps = new LinkedList<>();
private WeakReference<MapleMap> ownedMap = new WeakReference<>(null);
private final Map<Short, QuestStatus> quests;
private final Set<MapleMonster> controlled = new LinkedHashSet<>();
private final Set<Monster> controlled = new LinkedHashSet<>();
private final Map<Integer, String> entered = new LinkedHashMap<>();
private final Set<MapleMapObject> visibleMapObjects = Collections.newSetFromMap(new ConcurrentHashMap<>());
private final Map<Skill, SkillEntry> skills = new LinkedHashMap<>();
@@ -833,7 +833,7 @@ public class Character extends AbstractCharacterObject {
}
for (MapleMapObject mo : this.getMap().getMonsters()) {
MapleMonster m = (MapleMonster) mo;
Monster m = (Monster) mo;
m.aggroUpdateController();
}
} else {
@@ -1815,7 +1815,7 @@ public class Character extends AbstractCharacterObject {
}
}
public void controlMonster(MapleMonster monster) {
public void controlMonster(Monster monster) {
if (cpnLock.tryLock()) {
try {
controlled.add(monster);
@@ -1825,7 +1825,7 @@ public class Character extends AbstractCharacterObject {
}
}
public void stopControllingMonster(MapleMonster monster) {
public void stopControllingMonster(Monster monster) {
if (cpnLock.tryLock()) {
try {
controlled.remove(monster);
@@ -1844,7 +1844,7 @@ public class Character extends AbstractCharacterObject {
}
}
public Collection<MapleMonster> getControlledMonsters() {
public Collection<Monster> getControlledMonsters() {
cpnLock.lock();
try {
return new ArrayList<>(controlled);
@@ -1854,7 +1854,7 @@ public class Character extends AbstractCharacterObject {
}
public void releaseControlledMonsters() {
Collection<MapleMonster> controlledMonsters;
Collection<Monster> controlledMonsters;
cpnLock.lock();
try {
@@ -1864,7 +1864,7 @@ public class Character extends AbstractCharacterObject {
cpnLock.unlock();
}
for (MapleMonster monster : controlledMonsters) {
for (Monster monster : controlledMonsters) {
monster.aggroRedirectController();
}
}
@@ -9613,7 +9613,7 @@ public class Character extends AbstractCharacterObject {
}
}
public void showUnderleveledInfo(MapleMonster mob) {
public void showUnderleveledInfo(Monster mob) {
long curTime = Server.getInstance().getCurrentTime();
if (nextWarningTime < curTime) {
nextWarningTime = curTime + (60 * 1000); // show underlevel info again after 1 minute

4
src/main/java/client/Client.java
View File

@@ -58,7 +58,7 @@ import scripting.quest.QuestActionManager;
import scripting.quest.QuestScriptManager;
import server.ThreadManager;
import server.TimerManager;
import server.life.MapleMonster;
import server.life.Monster;
import server.maps.FieldLimit;
import server.maps.MapleMap;
import server.maps.MapleMiniDungeonInfo;
@@ -1416,7 +1416,7 @@ public class Client extends ChannelInboundHandlerAdapter {
sendPacket(PacketCreator.serverMessage(this.getChannelServer().getServerMessage()));
}
public synchronized void announceBossHpBar(MapleMonster mm, final int mobHash, Packet packet) {
public synchronized void announceBossHpBar(Monster mm, final int mobHash, Packet packet) {
long timeNow = System.currentTimeMillis();
int targetHash = player.getTargetHpBarHash();

4
src/main/java/client/command/commands/gm1/BossHpCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm1;
import client.Character;
import client.Client;
import client.command.Command;
import server.life.MapleMonster;
import server.life.Monster;
public class BossHpCommand extends Command {
{
@@ -36,7 +36,7 @@ public class BossHpCommand extends Command {
@Override
public void execute(Client c, String[] params) {
Character player = c.getPlayer();
for(MapleMonster monster : player.getMap().getAllMonsters()) {
for(Monster monster : player.getMap().getAllMonsters()) {
if(monster != null && monster.isBoss() && monster.getHp() > 0) {
long percent = monster.getHp() * 100L / monster.getMaxHp();
String bar = "[";

4
src/main/java/client/command/commands/gm1/MobHpCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm1;
import client.Character;
import client.Client;
import client.command.Command;
import server.life.MapleMonster;
import server.life.Monster;
public class MobHpCommand extends Command {
{
@@ -36,7 +36,7 @@ public class MobHpCommand extends Command {
@Override
public void execute(Client c, String[] params) {
Character player = c.getPlayer();
for(MapleMonster monster : player.getMap().getAllMonsters()) {
for(Monster monster : player.getMap().getAllMonsters()) {
if (monster != null && monster.getHp() > 0) {
player.yellowMessage(monster.getName() + " (" + monster.getId() + ") has " + monster.getHp() + " / " + monster.getMaxHp() + " HP.");

10
src/main/java/client/command/commands/gm2/WhereaMiCommand.java
View File

@@ -26,9 +26,9 @@ package client.command.commands.gm2;
import client.Character;
import client.Client;
import client.command.Command;
import server.life.MapleMonster;
import server.life.MapleNPC;
import server.life.MaplePlayerNPC;
import server.life.Monster;
import server.maps.MapleMapObject;
import java.util.HashSet;
@@ -45,7 +45,7 @@ public class WhereaMiCommand extends Command {
HashSet<Character> chars = new HashSet<>();
HashSet<MapleNPC> npcs = new HashSet<>();
HashSet<MaplePlayerNPC> playernpcs = new HashSet<>();
HashSet<MapleMonster> mobs = new HashSet<>();
HashSet<Monster> mobs = new HashSet<>();
for (MapleMapObject mmo : player.getMap().getMapObjects()) {
if (mmo instanceof MapleNPC) {
@@ -54,8 +54,8 @@ public class WhereaMiCommand extends Command {
} else if (mmo instanceof Character) {
Character mc = (Character) mmo;
chars.add(mc);
} else if (mmo instanceof MapleMonster) {
MapleMonster mob = (MapleMonster) mmo;
} else if (mmo instanceof Monster) {
Monster mob = (Monster) mmo;
if (mob.isAlive()) {
mobs.add(mob);
}
@@ -88,7 +88,7 @@ public class WhereaMiCommand extends Command {
if (!mobs.isEmpty()) {
player.yellowMessage("Monsters on this map:");
for (MapleMonster mob : mobs) {
for (Monster mob : mobs) {
if (mob.isAlive()) {
player.dropMessage(5, ">> " + mob.getName() + " - " + mob.getId() + " - Oid: " + mob.getObjectId());
}

4
src/main/java/client/command/commands/gm3/KillAllCommand.java
View File

@@ -26,7 +26,7 @@ package client.command.commands.gm3;
import client.Character;
import client.Client;
import client.command.Command;
import server.life.MapleMonster;
import server.life.Monster;
import server.maps.MapleMap;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
@@ -46,7 +46,7 @@ public class KillAllCommand extends Command {
List<MapleMapObject> monsters = map.getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));
int count = 0;
for (MapleMapObject monstermo : monsters) {
MapleMonster monster = (MapleMonster) monstermo;
Monster monster = (Monster) monstermo;
if (!monster.getStats().isFriendly() && !(monster.getId() >= 8810010 && monster.getId() <= 8810018)) {
map.damageMonster(player, monster, Integer.MAX_VALUE);
count++;

4
src/main/java/client/command/commands/gm3/SpawnCommand.java
View File

@@ -27,7 +27,7 @@ import client.Character;
import client.Client;
import client.command.Command;
import server.life.LifeFactory;
import server.life.MapleMonster;
import server.life.Monster;
public class SpawnCommand extends Command {
{
@@ -42,7 +42,7 @@ public class SpawnCommand extends Command {
return;
}
MapleMonster monster = LifeFactory.getMonster(Integer.parseInt(params[0]));
Monster monster = LifeFactory.getMonster(Integer.parseInt(params[0]));
if (monster == null) {
return;
}

4
src/main/java/client/command/commands/gm4/CakeCommand.java
View File

@@ -27,7 +27,7 @@ import client.Character;
import client.Client;
import client.command.Command;
import server.life.LifeFactory;
import server.life.MapleMonster;
import server.life.Monster;
public class CakeCommand extends Command {
{
@@ -37,7 +37,7 @@ public class CakeCommand extends Command {
@Override
public void execute(Client c, String[] params) {
Character player = c.getPlayer();
MapleMonster monster = LifeFactory.getMonster(9400606);
Monster monster = LifeFactory.getMonster(9400606);
if (params.length == 1) {
double mobHp = Double.parseDouble(params[0]);
int newHp = (mobHp <= 0) ? Integer.MAX_VALUE : ((mobHp > Integer.MAX_VALUE) ? Integer.MAX_VALUE : (int) mobHp);

4
src/main/java/client/command/commands/gm4/PmobCommand.java
View File

@@ -28,7 +28,7 @@ import client.Client;
import client.command.Command;
import net.server.channel.Channel;
import server.life.LifeFactory;
import server.life.MapleMonster;
import server.life.Monster;
import server.maps.MapleMap;
import tools.DatabaseConnection;
@@ -60,7 +60,7 @@ public class PmobCommand extends Command {
int ypos = checkpos.y;
int fh = player.getMap().getFootholds().findBelow(checkpos).getId();
MapleMonster mob = LifeFactory.getMonster(mobId);
Monster mob = LifeFactory.getMonster(mobId);
if (mob != null && !mob.getName().equals("MISSINGNO")) {
mob.setPosition(checkpos);
mob.setCy(ypos);

4
src/main/java/client/command/commands/gm5/DebugCommand.java
View File

@@ -28,7 +28,7 @@ import client.Client;
import client.command.Command;
import net.server.Server;
import server.TimerManager;
import server.life.MapleMonster;
import server.life.Monster;
import server.life.SpawnPoint;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
@@ -69,7 +69,7 @@ public class DebugCommand extends Command {
case "monster":
List<MapleMapObject> monsters = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.MONSTER));
for (MapleMapObject monstermo : monsters) {
MapleMonster monster = (MapleMonster) monstermo;
Monster monster = (Monster) monstermo;
Character controller = monster.getController();
player.message("Monster ID: " + monster.getId() + " Aggro target: " + ((controller != null) ? controller.getName() + " Has aggro: " + monster.isControllerHasAggro() + " Knowns aggro: " + monster.isControllerKnowsAboutAggro() : "<none>"));
}