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

Reworked Singapore/Malaysia + warp fix

Browse Source 
Reworked many aspects of the Malaysia/Singapore region (added DB data,
enabled Latanica & Scarga expedition, fixed maps). Fixed some issues
related with player warping.
This commit is contained in:
ronancpl
2017-07-14 20:40:06 -03:00
parent 7f80f45553
commit 8fab2a6e3e
120 changed files with 17684 additions and 16759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/scripting/AbstractPlayerInteraction.java
View File

@@ -89,9 +89,16 @@ public class AbstractPlayerInteraction {
return c.getPlayer().getMap();
}
public int getMarketPortalId(int mapId) {
return getMarketPortalId(getWarpMap(mapId));
}
private int getMarketPortalId(MapleMap map) {
return (map.findMarketPortal() != null) ? map.findMarketPortal().getId() : map.getRandomPlayerSpawnpoint().getId();
}
public void warp(int mapid) {
MapleMap map = getWarpMap(mapid);
getPlayer().changeMap(map, map.getRandomPlayerSpawnpoint());
getPlayer().changeMap(mapid);
}
public void warp(int map, int portal) {
@@ -107,11 +114,20 @@ public class AbstractPlayerInteraction {
}
public void warpParty(int id) {
for (MapleCharacter mc : getPartyMembers()) {
if (id == 925020100) {
mc.setDojoParty(true);
}
mc.changeMap(getWarpMap(id));
if (getPlayer().getParty() != null) {
MaplePartyCharacter leader = getPlayer().getParty().getMemberById(getPlayer().getParty().getLeaderId());
if(leader != null) {
int leaderMapId = leader.getMapId();
for (MapleCharacter mc : getPartyMembers()) {
if(mc.getMapId() == leaderMapId) {
if (id == 925020100) {
mc.setDojoParty(true);
}
mc.changeMap(id);
}
}
}
}
}