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/net/server/channel/handlers/AdminCommandHandler.java
View File

@@ -29,7 +29,7 @@ import client.inventory.manipulator.InventoryManipulator;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.life.MapleLifeFactory;
import server.life.LifeFactory;
import server.life.MapleMonster;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
@@ -55,7 +55,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(p.readInt());
for (int[] toSpawnChild : toSpawn) {
if (Randomizer.nextInt(100) < toSpawnChild[1]) {
c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());
c.getPlayer().getMap().spawnMonsterOnGroundBelow(LifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());
}
}
c.sendPacket(PacketCreator.enableActions());
@@ -141,7 +141,7 @@ public final class AdminCommandHandler extends AbstractPacketHandler {
int mobId = p.readInt();
int quantity = p.readInt();
for (int i = 0; i < quantity; i++) {
c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(mobId), c.getPlayer().getPosition());
c.getPlayer().getMap().spawnMonsterOnGroundBelow(LifeFactory.getMonster(mobId), c.getPlayer().getPosition());
}
break;
case 0x18: // Maple & Mobhp

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

@@ -23,7 +23,7 @@ import client.Character;
import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.life.MapleLifeFactory.BanishInfo;
import server.life.LifeFactory.BanishInfo;
import server.life.MapleMonster;
public final class MobBanishPlayerHandler extends AbstractPacketHandler {

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

@@ -28,7 +28,7 @@ import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.world.Party;
import net.server.world.PartyCharacter;
import server.life.MapleLifeFactory;
import server.life.LifeFactory;
import server.life.MapleMonster;
import server.partyquest.MapleCarnivalFactory;
import server.partyquest.MapleCarnivalFactory.MCSkill;
@@ -62,7 +62,7 @@ public final class MonsterCarnivalHandler extends AbstractPacketHandler {
return;
}
final MapleMonster mob = MapleLifeFactory.getMonster(mobs.get(num).left);
final MapleMonster 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) {

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

@@ -36,7 +36,7 @@ import constants.skills.Aran;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleStatEffect;
import server.life.MapleLifeFactory.loseItem;
import server.life.LifeFactory.loseItem;
import server.life.*;
import server.maps.MapleMap;
import server.maps.MapleMapObject;

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

@@ -28,7 +28,7 @@ import client.inventory.manipulator.InventoryManipulator;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.MapleItemInformationProvider;
import server.life.MapleLifeFactory;
import server.life.LifeFactory;
import tools.PacketCreator;
import tools.Randomizer;
@@ -54,7 +54,7 @@ public final class UseSummonBagHandler extends AbstractPacketHandler {
int[][] toSpawn = MapleItemInformationProvider.getInstance().getSummonMobs(itemId);
for (int[] toSpawnChild : toSpawn) {
if (Randomizer.nextInt(100) < toSpawnChild[1]) {
c.getPlayer().getMap().spawnMonsterOnGroundBelow(MapleLifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());
c.getPlayer().getMap().spawnMonsterOnGroundBelow(LifeFactory.getMonster(toSpawnChild[0]), c.getPlayer().getPosition());
}
}
}