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

Rename and clean up MapleSummon

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:39:43 +02:00
parent 03dc665605
commit 8a95459a17
10 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/server/channel/handlers/BeholderHandler.java
View File

@@ -25,7 +25,7 @@ import client.Client;
import constants.skills.DarkKnight;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapleSummon;
import server.maps.Summon;
import java.util.Collection;
@@ -38,10 +38,10 @@ public final class BeholderHandler extends AbstractPacketHandler {//Summon Skill
@Override
public final void handlePacket(InPacket p, Client c) {
//System.out.println(slea.toString());
Collection<MapleSummon> summons = c.getPlayer().getSummonsValues();
Collection<Summon> summons = c.getPlayer().getSummonsValues();
int oid = p.readInt();
MapleSummon summon = null;
for (MapleSummon sum : summons) {
Summon summon = null;
for (Summon sum : summons) {
if (sum.getObjectId() == oid) {
summon = sum;
}

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

@@ -27,7 +27,7 @@ import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import server.maps.MapObject;
import server.maps.MapleSummon;
import server.maps.Summon;
import tools.PacketCreator;
public final class DamageSummonHandler extends AbstractPacketHandler {
@@ -41,8 +41,8 @@ public final class DamageSummonHandler extends AbstractPacketHandler {
Character player = c.getPlayer();
MapObject mmo = player.getMap().getMapObject(oid);
if(mmo != null && mmo instanceof MapleSummon) {
MapleSummon summon = (MapleSummon) mmo;
if(mmo != null && mmo instanceof Summon) {
Summon summon = (Summon) mmo;
summon.addHP(-damage);
if (summon.getHP() <= 0) {

8
src/main/java/net/server/channel/handlers/MoveSummonHandler.java
View File

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
import client.Character;
import client.Client;
import net.packet.InPacket;
import server.maps.MapleSummon;
import server.maps.Summon;
import tools.PacketCreator;
import tools.exceptions.EmptyMovementException;
@@ -37,9 +37,9 @@ public final class MoveSummonHandler extends AbstractMovementPacketHandler {
int oid = p.readInt();
Point startPos = new Point(p.readShort(), p.readShort());
Character player = c.getPlayer();
Collection<MapleSummon> summons = player.getSummonsValues();
MapleSummon summon = null;
for (MapleSummon sum : summons) {
Collection<Summon> summons = player.getSummonsValues();
Summon summon = null;
for (Summon sum : summons) {
if (sum.getObjectId() == oid) {
summon = sum;
break;

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

@@ -36,7 +36,7 @@ import server.MapleItemInformationProvider;
import server.MapleStatEffect;
import server.life.Monster;
import server.life.MonsterInformationProvider;
import server.maps.MapleSummon;
import server.maps.Summon;
import tools.FilePrinter;
import tools.PacketCreator;
@@ -72,8 +72,8 @@ public final class SummonDamageHandler extends AbstractDealDamageHandler {
if (!player.isAlive()) {
return;
}
MapleSummon summon = null;
for (MapleSummon sum : player.getSummonsValues()) {
Summon summon = null;
for (Summon sum : player.getSummonsValues()) {
if (sum.getObjectId() == oid) {
summon = sum;
}