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

Rename MaplePortal

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:36:45 +02:00
parent 667bc69eb1
commit 7f4760ba1a
19 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/server/MapleStatEffect.java
View File

@@ -908,7 +908,7 @@ public class MapleStatEffect {
if (moveTo != -1) {
if (moveTo != applyto.getMapId()) {
MapleMap target;
MaplePortal pt;
Portal pt;
if (moveTo == 999999999) {
if (sourceid != 2030100) {

8
src/main/java/server/maps/Door.java
View File

@@ -37,7 +37,7 @@ import java.util.Collection;
public class Door {
private int ownerId;
private MapleMap town;
private MaplePortal townPortal;
private Portal townPortal;
private final MapleMap target;
private Pair<String, Integer> posStatus = null;
private long deployTime;
@@ -81,7 +81,7 @@ public class Door {
public void updateDoorPortal(Character owner) {
int slot = owner.fetchDoorSlot();
MaplePortal nextTownPortal = getTownDoorPortal(slot);
Portal nextTownPortal = getTownDoorPortal(slot);
if (nextTownPortal != null) {
townPortal = nextTownPortal;
areaDoor.update(nextTownPortal.getId(), nextTownPortal.getPosition());
@@ -141,7 +141,7 @@ public class Door {
}
}
private MaplePortal getTownDoorPortal(int doorid) {
private Portal getTownDoorPortal(int doorid) {
return town.getDoorPortal(doorid);
}
@@ -161,7 +161,7 @@ public class Door {
return town;
}
public MaplePortal getTownPortal() {
public Portal getTownPortal() {
return townPortal;
}

4
src/main/java/server/maps/GenericPortal.java
View File

@@ -32,7 +32,7 @@ import tools.PacketCreator;
import java.awt.*;
public class GenericPortal implements MaplePortal {
public class GenericPortal implements Portal {
private String name;
private String target;
private Point position;
@@ -144,7 +144,7 @@ public class GenericPortal implements MaplePortal {
Character chr = c.getPlayer();
if (!(chr.getChalkboard() != null && GameConstants.isFreeMarketRoom(getTargetMapId()))) {
MapleMap to = chr.getEventInstance() == null ? c.getChannelServer().getMapFactory().getMap(getTargetMapId()) : chr.getEventInstance().getMapInstance(getTargetMapId());
MaplePortal pto = to.getPortal(getTarget());
Portal pto = to.getPortal(getTarget());
if (pto == null) {// fallback for missing portals - no real life case anymore - interesting for not implemented areas
pto = to.getPortal(0);
}

4
src/main/java/server/maps/MapMonitor.java
View File

@@ -28,7 +28,7 @@ import java.util.concurrent.ScheduledFuture;
public class MapMonitor {
private ScheduledFuture<?> monitorSchedule;
private MapleMap map;
private MaplePortal portal;
private Portal portal;
public MapMonitor(final MapleMap map, String portal) {
this.map = map;
@@ -49,7 +49,7 @@ public class MapMonitor {
map.killAllMonsters();
map.clearDrops();
if (portal != null) {
portal.setPortalStatus(MaplePortal.OPEN);
portal.setPortalStatus(Portal.OPEN);
}
map.resetReactors();

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

@@ -23,6 +23,6 @@ package server.maps;
public class MapPortal extends GenericPortal {
public MapPortal() {
super(MaplePortal.MAP_PORTAL);
super(Portal.MAP_PORTAL);
}
}

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

@@ -90,7 +90,7 @@ public class MapleMap {
private final AtomicInteger droppedItemCount = new AtomicInteger(0);
private final Collection<Character> characters = new LinkedHashSet<>();
private final Map<Integer, Set<Integer>> mapParty = new LinkedHashMap<>();
private final Map<Integer, MaplePortal> portals = new HashMap<>();
private final Map<Integer, Portal> portals = new HashMap<>();
private final Map<Integer, Integer> backgroundTypes = new HashMap<>();
private final Map<String, Integer> environment = new LinkedHashMap<>();
private final Map<MapItem, Long> droppedItems = new LinkedHashMap<>();
@@ -596,7 +596,7 @@ public class MapleMap {
}
public Pair<String, Integer> getDoorPositionStatus(Point pos) {
MaplePortal portal = findClosestPlayerSpawnpoint(pos);
Portal portal = findClosestPlayerSpawnpoint(pos);
double angle = getAngle(portal.getPosition(), pos);
double distn = pos.distanceSq(portal.getPosition());
@@ -2051,8 +2051,8 @@ public class MapleMap {
}, chr -> chr.getMapId() == door.getFrom().getId());
}
public MaplePortal getDoorPortal(int doorid) {
MaplePortal doorPortal = portals.get(0x80 + doorid);
public Portal getDoorPortal(int doorid) {
Portal doorPortal = portals.get(0x80 + doorid);
if (doorPortal == null) {
FilePrinter.printError(FilePrinter.EXCEPTION, "[Door] " + mapName + "(" + mapid + ") does not contain door portalid " + doorid);
return portals.get(0x80);
@@ -2584,23 +2584,23 @@ public class MapleMap {
Server.getInstance().registerAnnouncePlayerDiseases(c);
}
public MaplePortal getRandomPlayerSpawnpoint() {
List<MaplePortal> spawnPoints = new ArrayList<>();
for (MaplePortal portal : portals.values()) {
public Portal getRandomPlayerSpawnpoint() {
List<Portal> spawnPoints = new ArrayList<>();
for (Portal portal : portals.values()) {
if (portal.getType() >= 0 && portal.getType() <= 1 && portal.getTargetMapId() == 999999999) {
spawnPoints.add(portal);
}
}
MaplePortal portal = spawnPoints.get(new Random().nextInt(spawnPoints.size()));
Portal portal = spawnPoints.get(new Random().nextInt(spawnPoints.size()));
return portal != null ? portal : getPortal(0);
}
public MaplePortal findClosestTeleportPortal(Point from) {
MaplePortal closest = null;
public Portal findClosestTeleportPortal(Point from) {
Portal closest = null;
double shortestDistance = Double.POSITIVE_INFINITY;
for (MaplePortal portal : portals.values()) {
for (Portal portal : portals.values()) {
double distance = portal.getPosition().distanceSq(from);
if (portal.getType() == MaplePortal.TELEPORT_PORTAL && distance < shortestDistance && portal.getTargetMapId() != 999999999) {
if (portal.getType() == Portal.TELEPORT_PORTAL && distance < shortestDistance && portal.getTargetMapId() != 999999999) {
closest = portal;
shortestDistance = distance;
}
@@ -2608,10 +2608,10 @@ public class MapleMap {
return closest;
}
public MaplePortal findClosestPlayerSpawnpoint(Point from) {
MaplePortal closest = null;
public Portal findClosestPlayerSpawnpoint(Point from) {
Portal closest = null;
double shortestDistance = Double.POSITIVE_INFINITY;
for (MaplePortal portal : portals.values()) {
for (Portal portal : portals.values()) {
double distance = portal.getPosition().distanceSq(from);
if (portal.getType() >= 0 && portal.getType() <= 1 && distance < shortestDistance && portal.getTargetMapId() == 999999999) {
closest = portal;
@@ -2621,10 +2621,10 @@ public class MapleMap {
return closest;
}
public MaplePortal findClosestPortal(Point from) {
MaplePortal closest = null;
public Portal findClosestPortal(Point from) {
Portal closest = null;
double shortestDistance = Double.POSITIVE_INFINITY;
for (MaplePortal portal : portals.values()) {
for (Portal portal : portals.values()) {
double distance = portal.getPosition().distanceSq(from);
if (distance < shortestDistance) {
closest = portal;
@@ -2634,8 +2634,8 @@ public class MapleMap {
return closest;
}
public MaplePortal findMarketPortal() {
for (MaplePortal portal : portals.values()) {
public Portal findMarketPortal() {
for (Portal portal : portals.values()) {
String ptScript = portal.getScriptName();
if (ptScript != null && ptScript.contains("market")) {
return portal;
@@ -2645,7 +2645,7 @@ public class MapleMap {
}
/*
public Collection<MaplePortal> getPortals() {
public Collection<Portal> getPortals() {
return Collections.unmodifiableCollection(portals.values());
}
*/
@@ -3008,12 +3008,12 @@ public class MapleMap {
}
}
public void addPortal(MaplePortal myPortal) {
public void addPortal(Portal myPortal) {
portals.put(myPortal.getId(), myPortal);
}
public MaplePortal getPortal(String portalname) {
for (MaplePortal port : portals.values()) {
public Portal getPortal(String portalname) {
for (Portal port : portals.values()) {
if (port.getName().equals(portalname)) {
return port;
}
@@ -3021,7 +3021,7 @@ public class MapleMap {
return null;
}
public MaplePortal getPortal(int portalid) {
public Portal getPortal(int portalid) {
return portals.get(portalid);
}

6
src/main/java/server/maps/MaplePortalFactory.java
View File

@@ -33,9 +33,9 @@ public class MaplePortalFactory {
nextDoorPortal = 0x80;
}
public MaplePortal makePortal(int type, Data portal) {
public Portal makePortal(int type, Data portal) {
GenericPortal ret = null;
if (type == MaplePortal.MAP_PORTAL) {
if (type == Portal.MAP_PORTAL) {
ret = new MapPortal();
} else {
ret = new GenericPortal(type);
@@ -56,7 +56,7 @@ public class MaplePortalFactory {
script = null;
}
myPortal.setScriptName(script);
if (myPortal.getType() == MaplePortal.DOOR_PORTAL) {
if (myPortal.getType() == Portal.DOOR_PORTAL) {
myPortal.setId(nextDoorPortal);
nextDoorPortal++;
} else {

2
src/main/java/server/maps/MaplePortal.java → src/main/java/server/maps/Portal.java
View File

@@ -25,7 +25,7 @@ import client.Client;
import java.awt.*;
public interface MaplePortal {
public interface Portal {
int TELEPORT_PORTAL = 1;
int MAP_PORTAL = 2;
int DOOR_PORTAL = 6;