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

6
src/main/java/scripting/AbstractPlayerInteraction.java
View File

@@ -948,7 +948,7 @@ public class AbstractPlayerInteraction {
}
public void spawnNpc(int npcId, Point pos, MapleMap map) {
MapleNPC npc = MapleLifeFactory.getNPC(npcId);
MapleNPC npc = LifeFactory.getNPC(npcId);
if (npc != null) {
npc.setPosition(pos);
npc.setCy(pos.y);
@@ -961,13 +961,13 @@ public class AbstractPlayerInteraction {
}
public void spawnMonster(int id, int x, int y) {
MapleMonster monster = MapleLifeFactory.getMonster(id);
MapleMonster monster = LifeFactory.getMonster(id);
monster.setPosition(new Point(x, y));
getPlayer().getMap().spawnMonster(monster);
}
public MapleMonster getMonsterLifeFactory(int mid) {
return MapleLifeFactory.getMonster(mid);
return LifeFactory.getMonster(mid);
}
public MobSkill getMobSkill(int skill, int level) {

6
src/main/java/scripting/event/EventInstanceManager.java
View File

@@ -41,7 +41,7 @@ import server.MapleStatEffect;
import server.ThreadManager;
import server.TimerManager;
import server.expeditions.Expedition;
import server.life.MapleLifeFactory;
import server.life.LifeFactory;
import server.life.MapleMonster;
import server.life.MapleNPC;
import server.maps.MapleMap;
@@ -849,7 +849,7 @@ public class EventInstanceManager {
}
public void spawnNpc(int npcId, Point pos, MapleMap map) {
MapleNPC npc = MapleLifeFactory.getNPC(npcId);
MapleNPC npc = LifeFactory.getNPC(npcId);
if (npc != null) {
npc.setPosition(pos);
npc.setCy(pos.y);
@@ -877,7 +877,7 @@ public class EventInstanceManager {
}
public MapleMonster getMonster(int mid) {
return(MapleLifeFactory.getMonster(mid));
return(LifeFactory.getMonster(mid));
}
private List<Integer> convertToIntegerList(List<Object> objects) {

4
src/main/java/scripting/event/EventManager.java
View File

@@ -38,7 +38,7 @@ import scripting.event.scheduler.EventScriptScheduler;
import server.MapleMarriage;
import server.ThreadManager;
import server.expeditions.Expedition;
import server.life.MapleLifeFactory;
import server.life.LifeFactory;
import server.life.MapleMonster;
import server.maps.MapleMap;
import server.quest.MapleQuest;
@@ -738,7 +738,7 @@ public class EventManager {
}
public MapleMonster getMonster(int mid) {
return(MapleLifeFactory.getMonster(mid));
return(LifeFactory.getMonster(mid));
}
private void exportReadyGuild(Integer guildId) {

4
src/main/java/scripting/npc/NPCConversationManager.java
View File

@@ -49,7 +49,7 @@ import server.expeditions.Expedition;
import server.expeditions.ExpeditionType;
import server.gachapon.MapleGachapon;
import server.gachapon.MapleGachapon.MapleGachaponItem;
import server.life.MapleLifeFactory;
import server.life.LifeFactory;
import server.life.MaplePlayerNPC;
import server.maps.MapleMap;
import server.maps.MapleMapManager;
@@ -87,7 +87,7 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
private String getDefaultTalk(int npcid) {
String talk = npcDefaultTalks.get(npcid);
if (talk == null) {
talk = MapleLifeFactory.getNPCDefaultTalk(npcid);
talk = LifeFactory.getNPCDefaultTalk(npcid);
npcDefaultTalks.put(npcid, talk);
}

6
src/main/java/scripting/reactor/ReactorActionManager.java
View File

@@ -31,7 +31,7 @@ import constants.inventory.ItemConstants;
import scripting.AbstractPlayerInteraction;
import server.MapleItemInformationProvider;
import server.TimerManager;
import server.life.MapleLifeFactory;
import server.life.LifeFactory;
import server.life.MapleMonster;
import server.maps.MapMonitor;
import server.maps.MapleMap;
@@ -262,7 +262,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
public void spawnMonster(int id, int qty, Point pos) {
for (int i = 0; i < qty; i++) {
reactor.getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(id), pos);
reactor.getMap().spawnMonsterOnGroundBelow(LifeFactory.getMonster(id), pos);
}
}
@@ -304,7 +304,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
}
public void spawnFakeMonster(int id) {
reactor.getMap().spawnFakeMonsterOnGroundBelow(MapleLifeFactory.getMonster(id), getPosition());
reactor.getMap().spawnFakeMonsterOnGroundBelow(LifeFactory.getMonster(id), getPosition());
}
/**