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

More Masteria quests + several minor fixes

Browse Source 
Added more quests on Masteria and updated drop data in the region. Fixed
mystic door on slopes deploying players unproperly. Fixed mounts
equipped by low level players crashing the client.
This commit is contained in:
ronancpl
2017-07-12 02:36:20 -03:00
parent 57125a70ce
commit 7f80f45553
70 changed files with 7004 additions and 6420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/MapleShopFactory.java
View File

@@ -63,7 +63,7 @@ public class MapleShopFactory {
public MapleShop getShopForNPC(int npcId) {
if (npcShops.containsKey(npcId)) {
npcShops.get(npcId);
return npcShops.get(npcId);
}
return loadShop(npcId, false);
}

6
src/server/MapleStatEffect.java
View File

@@ -846,7 +846,7 @@ public class MapleStatEffect {
Point doorPosition = new Point(applyto.getPosition().x, y);
MapleDoor door = new MapleDoor(applyto, doorPosition);
if(door.getOwnerId() != -1) {
if(door.getOwnerId() > -1) {
if (applyto.getParty() != null) {
for (MaplePartyCharacter partyMember : applyto.getParty().getMembers()) {
partyMember.getPlayer().addDoor(door.getOwnerId(), door);
@@ -860,7 +860,9 @@ public class MapleStatEffect {
door.getTarget().spawnDoor(door.getAreaDoor());
door.getTown().spawnDoor(door.getTownDoor());
} else {
applyto.dropMessage(5, "There are no door portals available for the town at this moment. Try again later.");
if(door.getOwnerId() == -1) applyto.dropMessage(5, "There are no door portals available for the town at this moment. Try again later.");
else applyto.dropMessage(5, "This position is not suitable for a Mystic Door, try elsewhere.");
applyto.cancelBuffStats(MapleBuffStat.SOULARROW); // cancel door buff
}
applyto.disableDoor();

24
src/server/maps/MapleDoor.java
View File

@@ -45,17 +45,21 @@ public class MapleDoor {
this.ownerId = owner.getId();
this.target = owner.getMap();
this.town = this.target.getReturnMap();
this.townPortal = allocateFreePortal();
if(townPortal != null) {
this.areaDoor = new MapleDoorObject(ownerId, town, target, false, targetPosition, townPortal.getPosition());
this.townDoor = new MapleDoorObject(ownerId, target, town, true, townPortal.getPosition(), targetPosition);
this.areaDoor.setPairOid(this.townDoor.getObjectId());
this.townDoor.setPairOid(this.areaDoor.getObjectId());
if(target.canDeployDoor(targetPosition)) {
this.town = this.target.getReturnMap();
this.townPortal = allocateFreePortal();
if(townPortal != null) {
this.areaDoor = new MapleDoorObject(ownerId, town, target, false, targetPosition, townPortal.getPosition());
this.townDoor = new MapleDoorObject(ownerId, target, town, true, townPortal.getPosition(), targetPosition);
this.areaDoor.setPairOid(this.townDoor.getObjectId());
this.townDoor.setPairOid(this.areaDoor.getObjectId());
} else {
this.ownerId = -1;
}
} else {
this.ownerId = -1;
this.ownerId = -2;
}
}

5
src/server/maps/MapleMap.java
View File

@@ -433,6 +433,11 @@ public class MapleMap {
}
return ret;
}
public boolean canDeployDoor(Point pos) {
Point toStep = calcPointBelow(pos);
return toStep != null && toStep.distance(pos) < 20;
}
private void dropFromMonster(final MapleCharacter chr, final MapleMonster mob) {
if (mob.dropsDisabled() || !dropsOn) {