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

Rename and clean up MapleLifeFactory

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:04:57 +02:00
parent 1f349d1dae
commit 38c700ca48
113 changed files with 309 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/server/maps/MapleMap.java
View File

@@ -58,7 +58,7 @@ import server.MapleStatEffect;
import server.TimerManager;
import server.events.gm.*;
import server.life.*;
import server.life.MapleLifeFactory.selfDestruction;
import server.life.LifeFactory.selfDestruction;
import server.partyquest.GuardianSpawnPoint;
import server.partyquest.MapleCarnivalFactory;
import server.partyquest.MapleCarnivalFactory.MCSkill;
@@ -1813,7 +1813,7 @@ public class MapleMap {
}
public void spawnMonsterOnGroundBelow(int id, int x, int y) {
MapleMonster mob = MapleLifeFactory.getMonster(id);
MapleMonster mob = LifeFactory.getMonster(id);
spawnMonsterOnGroundBelow(mob, new Point(x, y));
}
@@ -4039,10 +4039,10 @@ public class MapleMap {
}
public void spawnHorntailOnGroundBelow(final Point targetPoint) { // ayy lmao
MapleMonster htIntro = MapleLifeFactory.getMonster(8810026);
MapleMonster htIntro = LifeFactory.getMonster(8810026);
spawnMonsterOnGroundBelow(htIntro, targetPoint); // htintro spawn animation converting into horntail detected thanks to Arnah
final MapleMonster ht = MapleLifeFactory.getMonster(8810018);
final MapleMonster ht = LifeFactory.getMonster(8810018);
ht.setParentMobOid(htIntro.getObjectId());
ht.addListener(new MonsterListener() {
@Override
@@ -4061,7 +4061,7 @@ public class MapleMap {
spawnMonsterOnGroundBelow(ht, targetPoint);
for (int x = 8810002; x <= 8810009; x++) {
MapleMonster m = MapleLifeFactory.getMonster(x);
MapleMonster m = LifeFactory.getMonster(x);
m.setParentMobOid(htIntro.getObjectId());
m.addListener(new MonsterListener() {

2
src/main/java/server/maps/MapleMapFactory.java
View File

@@ -339,7 +339,7 @@ public class MapleMapFactory {
}
private static AbstractLoadedLife loadLife(int id, String type, int cy, int f, int fh, int rx0, int rx1, int x, int y, int hide) {
AbstractLoadedLife myLife = MapleLifeFactory.getLife(id, type);
AbstractLoadedLife myLife = LifeFactory.getLife(id, type);
myLife.setCy(cy);
myLife.setF(f);
myLife.setFh(fh);