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

Rename and clean up MapleDragon

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:19:33 +02:00
parent 4032558ef5
commit c0fedc8589
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,7 +233,7 @@ public class Character extends AbstractCharacterObject {
private Map<String, Events> events = new LinkedHashMap<>(); private Map<String, Events> events = new LinkedHashMap<>();
private PartyQuest partyQuest = null; private PartyQuest partyQuest = null;
private final List<Pair<DelayedQuestUpdate, Object[]>> npcUpdateQuests = new LinkedList<>(); private final List<Pair<DelayedQuestUpdate, Object[]>> npcUpdateQuests = new LinkedList<>();
private MapleDragon dragon = null; private Dragon dragon = null;
private Ring marriageRing; private Ring marriageRing;
private int marriageItemid = -1; private int marriageItemid = -1;
private int partnerId = -1; private int partnerId = -1;
@@ -10615,14 +10615,14 @@ public class Character extends AbstractCharacterObject {
} }
public void createDragon() { public void createDragon() {
dragon = new MapleDragon(this); dragon = new Dragon(this);
} }
public MapleDragon getDragon() { public Dragon getDragon() {
return dragon; return dragon;
} }
public void setDragon(MapleDragon dragon) { public void setDragon(Dragon dragon) {
this.dragon = dragon; this.dragon = dragon;
} }

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

@@ -24,7 +24,7 @@ package net.server.channel.handlers;
import client.Character; import client.Character;
import client.Client; import client.Client;
import net.packet.InPacket; import net.packet.InPacket;
import server.maps.MapleDragon; import server.maps.Dragon;
import tools.PacketCreator; import tools.PacketCreator;
import tools.exceptions.EmptyMovementException; import tools.exceptions.EmptyMovementException;
@@ -36,7 +36,7 @@ public class MoveDragonHandler extends AbstractMovementPacketHandler {
public void handlePacket(InPacket p, Client c) { public void handlePacket(InPacket p, Client c) {
final Character chr = c.getPlayer(); final Character chr = c.getPlayer();
final Point startPos = new Point(p.readShort(), p.readShort()); final Point startPos = new Point(p.readShort(), p.readShort());
final MapleDragon dragon = chr.getDragon(); final Dragon dragon = chr.getDragon();
if (dragon != null) { if (dragon != null) {
try { try {
int movementDataStart = p.getPosition(); int movementDataStart = p.getPosition();

12
src/main/java/server/maps/MapleDragon.java → src/main/java/server/maps/Dragon.java
View File

@@ -26,12 +26,10 @@ import client.Client;
import tools.PacketCreator; import tools.PacketCreator;
public class Dragon extends AbstractAnimatedMapObject {
private final Character owner;
public class MapleDragon extends AbstractAnimatedMapObject { public Dragon(Character chr) {
private Character owner;
public MapleDragon(Character chr) {
super(); super();
this.owner = chr; this.owner = chr;
this.setPosition(chr.getPosition()); this.setPosition(chr.getPosition());
@@ -58,8 +56,8 @@ public class MapleDragon extends AbstractAnimatedMapObject {
public void sendDestroyData(Client c) { public void sendDestroyData(Client c) {
c.sendPacket(PacketCreator.removeDragon(owner.getId())); c.sendPacket(PacketCreator.removeDragon(owner.getId()));
} }
public Character getOwner() { public Character getOwner() {
return owner; return owner;
} }
} }

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

@@ -2523,7 +2523,7 @@ public class MapleMap {
addMapObject(chr.getPlayerShop()); addMapObject(chr.getPlayerShop());
} }
final MapleDragon dragon = chr.getDragon(); final Dragon dragon = chr.getDragon();
if (dragon != null) { if (dragon != null) {
dragon.setPosition(chr.getPosition()); dragon.setPosition(chr.getPosition());
this.addMapObject(dragon); this.addMapObject(dragon);

4
src/main/java/tools/PacketCreator.java
View File

@@ -7276,7 +7276,7 @@ public class PacketCreator {
return p; return p;
} }
public static Packet spawnDragon(MapleDragon dragon) { public static Packet spawnDragon(Dragon dragon) {
OutPacket p = OutPacket.create(SendOpcode.SPAWN_DRAGON); OutPacket p = OutPacket.create(SendOpcode.SPAWN_DRAGON);
p.writeInt(dragon.getOwner().getId());//objectid = owner id p.writeInt(dragon.getOwner().getId());//objectid = owner id
p.writeShort(dragon.getPosition().x); p.writeShort(dragon.getPosition().x);
@@ -7289,7 +7289,7 @@ public class PacketCreator {
return p; return p;
} }
public static Packet moveDragon(MapleDragon dragon, Point startPos, InPacket movementPacket, long movementDataLength) { public static Packet moveDragon(Dragon dragon, Point startPos, InPacket movementPacket, long movementDataLength) {
final OutPacket p = OutPacket.create(SendOpcode.MOVE_DRAGON); final OutPacket p = OutPacket.create(SendOpcode.MOVE_DRAGON);
p.writeInt(dragon.getOwner().getId()); p.writeInt(dragon.getOwner().getId());
p.writePos(startPos); p.writePos(startPos);