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

Rename and clean up MapleDoorObject

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:18:52 +02:00
parent 584e626ed5
commit 4032558ef5
6 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/client/Character.java
+6 -6
View File
@@ -1553,7 +1553,7 @@ public class Character extends AbstractCharacterObject {
for (Door door : partyDoors.values()) { for (Door door : partyDoors.values()) {
for (Character pchar : partyMembers) { for (Character pchar : partyMembers) {
MapleDoorObject mdo = door.getTownDoor(); DoorObject mdo = door.getTownDoor();
mdo.sendDestroyData(pchar.getClient(), true); mdo.sendDestroyData(pchar.getClient(), true);
pchar.removeVisibleMapObject(mdo); pchar.removeVisibleMapObject(mdo);
} }
@@ -1563,7 +1563,7 @@ public class Character extends AbstractCharacterObject {
Collection<Door> leaverDoors = partyLeaver.getDoors(); Collection<Door> leaverDoors = partyLeaver.getDoors();
for (Door door : leaverDoors) { for (Door door : leaverDoors) {
for (Character pchar : partyMembers) { for (Character pchar : partyMembers) {
MapleDoorObject mdo = door.getTownDoor(); DoorObject mdo = door.getTownDoor();
mdo.sendDestroyData(pchar.getClient(), true); mdo.sendDestroyData(pchar.getClient(), true);
pchar.removeVisibleMapObject(mdo); pchar.removeVisibleMapObject(mdo);
} }
@@ -1576,7 +1576,7 @@ public class Character extends AbstractCharacterObject {
if (door != null) { if (door != null) {
for (Character pchar : partyMembers) { for (Character pchar : partyMembers) {
MapleDoorObject mdo = door.getTownDoor(); DoorObject mdo = door.getTownDoor();
mdo.sendSpawnData(pchar.getClient()); mdo.sendSpawnData(pchar.getClient());
pchar.addVisibleMapObject(mdo); pchar.addVisibleMapObject(mdo);
} }
@@ -1589,14 +1589,14 @@ public class Character extends AbstractCharacterObject {
if (partyDoors != null) { if (partyDoors != null) {
for (Door door : partyDoors.values()) { for (Door door : partyDoors.values()) {
MapleDoorObject mdo = door.getTownDoor(); DoorObject mdo = door.getTownDoor();
mdo.sendDestroyData(partyLeaver.getClient(), true); mdo.sendDestroyData(partyLeaver.getClient(), true);
partyLeaver.removeVisibleMapObject(mdo); partyLeaver.removeVisibleMapObject(mdo);
} }
} }
for (Door door : leaverDoors) { for (Door door : leaverDoors) {
MapleDoorObject mdo = door.getTownDoor(); DoorObject mdo = door.getTownDoor();
mdo.sendDestroyData(partyLeaver.getClient(), true); mdo.sendDestroyData(partyLeaver.getClient(), true);
partyLeaver.removeVisibleMapObject(mdo); partyLeaver.removeVisibleMapObject(mdo);
} }
@@ -1604,7 +1604,7 @@ public class Character extends AbstractCharacterObject {
for (Door door : leaverDoors) { for (Door door : leaverDoors) {
door.updateDoorPortal(partyLeaver); door.updateDoorPortal(partyLeaver);
MapleDoorObject mdo = door.getTownDoor(); DoorObject mdo = door.getTownDoor();
mdo.sendSpawnData(partyLeaver.getClient()); mdo.sendSpawnData(partyLeaver.getClient());
partyLeaver.addVisibleMapObject(mdo); partyLeaver.addVisibleMapObject(mdo);
} }
src/main/java/net/server/channel/handlers/DoorHandler.java
+3 -3
View File
@@ -25,7 +25,7 @@ import client.Character;
import client.Client; import client.Client;
import net.AbstractPacketHandler; import net.AbstractPacketHandler;
import net.packet.InPacket; import net.packet.InPacket;
import server.maps.MapleDoorObject; import server.maps.DoorObject;
import server.maps.MapleMapObject; import server.maps.MapleMapObject;
import tools.PacketCreator; import tools.PacketCreator;
@@ -46,8 +46,8 @@ public final class DoorHandler extends AbstractPacketHandler {
} }
for (MapleMapObject obj : chr.getMap().getMapObjects()) { for (MapleMapObject obj : chr.getMap().getMapObjects()) {
if (obj instanceof MapleDoorObject) { if (obj instanceof DoorObject) {
MapleDoorObject door = (MapleDoorObject) obj; DoorObject door = (DoorObject) obj;
if (door.getOwnerId() == ownerid) { if (door.getOwnerId() == ownerid) {
door.warp(chr); door.warp(chr);
return; return;
src/main/java/server/maps/Door.java
+8 -8
View File
@@ -43,8 +43,8 @@ public class Door {
private long deployTime; private long deployTime;
private boolean active; private boolean active;
private MapleDoorObject townDoor; private DoorObject townDoor;
private MapleDoorObject areaDoor; private DoorObject areaDoor;
public Door(Character owner, Point targetPosition) { public Door(Character owner, Point targetPosition) {
this.ownerId = owner.getId(); this.ownerId = owner.getId();
@@ -62,8 +62,8 @@ public class Door {
this.active = true; this.active = true;
if (townPortal != null) { if (townPortal != null) {
this.areaDoor = new MapleDoorObject(ownerId, town, target, townPortal.getId(), targetPosition, townPortal.getPosition()); this.areaDoor = new DoorObject(ownerId, town, target, townPortal.getId(), targetPosition, townPortal.getPosition());
this.townDoor = new MapleDoorObject(ownerId, target, town, -1, townPortal.getPosition(), targetPosition); this.townDoor = new DoorObject(ownerId, target, town, -1, townPortal.getPosition(), targetPosition);
this.areaDoor.setPairOid(this.townDoor.getObjectId()); this.areaDoor.setPairOid(this.townDoor.getObjectId());
this.townDoor.setPairOid(this.areaDoor.getObjectId()); this.townDoor.setPairOid(this.areaDoor.getObjectId());
@@ -89,8 +89,8 @@ public class Door {
} }
private void broadcastRemoveDoor(Character owner) { private void broadcastRemoveDoor(Character owner) {
MapleDoorObject areaDoor = this.getAreaDoor(); DoorObject areaDoor = this.getAreaDoor();
MapleDoorObject townDoor = this.getTownDoor(); DoorObject townDoor = this.getTownDoor();
MapleMap target = this.getTarget(); MapleMap target = this.getTarget();
MapleMap town = this.getTown(); MapleMap town = this.getTown();
@@ -149,11 +149,11 @@ public class Door {
return ownerId; return ownerId;
} }
public MapleDoorObject getTownDoor() { public DoorObject getTownDoor() {
return townDoor; return townDoor;
} }
public MapleDoorObject getAreaDoor() { public DoorObject getAreaDoor() {
return areaDoor; return areaDoor;
} }
src/main/java/server/maps/MapleDoorObject.java → src/main/java/server/maps/DoorObject.java
+5 -6
View File
@@ -33,10 +33,9 @@ import tools.PacketCreator;
import java.awt.*; import java.awt.*;
/** /**
*
* @author Ronan * @author Ronan
*/ */
public class MapleDoorObject extends AbstractMapObject { public class DoorObject extends AbstractMapObject {
private final int ownerId; private final int ownerId;
private int pairOid; private int pairOid;
@@ -46,10 +45,10 @@ public class MapleDoorObject extends AbstractMapObject {
private Point linkedPos; private Point linkedPos;
private final MonitoredReentrantReadWriteLock locks = new MonitoredReentrantReadWriteLock(MonitoredLockType.PLAYER_DOOR, true); private final MonitoredReentrantReadWriteLock locks = new MonitoredReentrantReadWriteLock(MonitoredLockType.PLAYER_DOOR, true);
private MonitoredReadLock rlock = MonitoredReadLockFactory.createLock(locks); private final MonitoredReadLock rlock = MonitoredReadLockFactory.createLock(locks);
private MonitoredWriteLock wlock = MonitoredWriteLockFactory.createLock(locks); private final MonitoredWriteLock wlock = MonitoredWriteLockFactory.createLock(locks);
public MapleDoorObject(int owner, MapleMap destination, MapleMap origin, int townPortalId, Point targetPosition, Point toPosition) { public DoorObject(int owner, MapleMap destination, MapleMap origin, int townPortalId, Point targetPosition, Point toPosition) {
super(); super();
setPosition(targetPosition); setPosition(targetPosition);
@@ -93,7 +92,7 @@ public class MapleDoorObject extends AbstractMapObject {
if (chr.getId() == ownerId || (party != null && party.getMemberById(ownerId) != null)) { if (chr.getId() == ownerId || (party != null && party.getMemberById(ownerId) != null)) {
chr.sendPacket(PacketCreator.playPortalSound()); chr.sendPacket(PacketCreator.playPortalSound());
if(!inTown() && party == null) { if (!inTown() && party == null) {
chr.changeMap(to, getLinkedPortalId()); chr.changeMap(to, getLinkedPortalId());
} else { } else {
chr.changeMap(to, getLinkedPortalPosition()); chr.changeMap(to, getLinkedPortalPosition());
src/main/java/server/maps/MapleMap.java
+1 -1
View File
@@ -2040,7 +2040,7 @@ public class MapleMap {
spawnAndAddRangedMapObject(reactor, c -> c.sendPacket(reactor.makeSpawnData())); spawnAndAddRangedMapObject(reactor, c -> c.sendPacket(reactor.makeSpawnData()));
} }
public void spawnDoor(final MapleDoorObject door) { public void spawnDoor(final DoorObject door) {
spawnAndAddRangedMapObject(door, c -> { spawnAndAddRangedMapObject(door, c -> {
Character chr = c.getPlayer(); Character chr = c.getPlayer();
if (chr != null) { if (chr != null) {
src/main/java/tools/PacketCreator.java
+2 -2
View File
@@ -3692,7 +3692,7 @@ public class PacketCreator {
Door door = partyDoors.get(partycharid); Door door = partyDoors.get(partycharid);
if (door != null) { if (door != null) {
MapleDoorObject mdo = door.getAreaDoor(); DoorObject mdo = door.getAreaDoor();
p.writeInt(mdo.getTo().getId()); p.writeInt(mdo.getTo().getId());
p.writeInt(mdo.getFrom().getId()); p.writeInt(mdo.getFrom().getId());
p.writeInt(mdo.getPosition().x); p.writeInt(mdo.getPosition().x);
@@ -3803,7 +3803,7 @@ public class PacketCreator {
if (partyDoors.size() > 0) { if (partyDoors.size() > 0) {
Door door = partyDoors.get(partychar.getId()); Door door = partyDoors.get(partychar.getId());
if (door != null) { if (door != null) {
MapleDoorObject mdo = door.getTownDoor(); DoorObject mdo = door.getTownDoor();
p.writeInt(mdo.getTown().getId()); p.writeInt(mdo.getTown().getId());
p.writeInt(mdo.getArea().getId()); p.writeInt(mdo.getArea().getId());
p.writeInt(mdo.getPosition().x); p.writeInt(mdo.getPosition().x);