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

Mystic Doors review + Togglable SrvMessage-BossHP + Map-Event patch

Browse Source 
Reviewed Mystic Doors.
Fixed several issues showing up on Duey in uncommon scenarios.
Fixed a concurrency issue with XMLDomMapleData.
Scheduled forward the "lock disposal" action within the source. Now, it's expected that, after a set while, no method should require usage of a disposed lock and, during that while, a supposed "disposed lock" is still available to run (although no new processes is expected to require use of these locks).
Fixed concurrency issues with player's current event instance, generating several inconsistencies when swiftly registering/unregistering from events.
Implemented a mutually exclusive approach for server message - Boss HPbar.
Fixed item-making Kage requiring lv71~80 ETC instead of the expected 81~90.
Removed the possibility to buy cosmetic coupons with mesos through the NPCs.
Sleepywood JQ's no longer gives cash items when they finish the quest repeatedly.
Added Duey trucks in several maps lacking it. Added NPC Duey in New Leaf City.
Fixed scripted quests not calculating QUEST_RATE (if applied) when rewarding experience and meso.
This commit is contained in:
ronancpl
2018-08-07 23:37:24 -03:00
parent cc541f39d5
commit 4c25c07e28
173 changed files with 38064 additions and 37254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/MapleStatEffect.java
+1 -9
View File
@@ -897,15 +897,7 @@ public class MapleStatEffect {
MapleDoor door = new MapleDoor(applyto, doorPosition);
if(door.getOwnerId() >= 0) {
if (applyto.getParty() != null) {
for (MaplePartyCharacter partyMember : applyto.getParty().getMembers()) {
partyMember.getPlayer().addDoor(door.getOwnerId(), door);
partyMember.addDoor(door.getOwnerId(), door);
}
applyto.silentPartyUpdate();
} else {
applyto.addDoor(door.getOwnerId(), door);
}
applyto.applyPartyDoor(door, false);
door.getTarget().spawnDoor(door.getAreaDoor());
door.getTown().spawnDoor(door.getTownDoor());
src/server/life/MapleMonster.java
+11 -10
View File
@@ -69,6 +69,7 @@ import server.maps.MapleMapObjectType;
import tools.MaplePacketCreator;
import tools.Pair;
import tools.Randomizer;
import net.server.audit.LockCollector;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
@@ -823,10 +824,6 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
if (hasBossHPBar()) {
if (this.getMap().countMonster(8810026) > 0 && this.getMap().getId() == 240060200) {
this.getMap().killAllMonsters();
return;
}
c.announceBossHpBar(this, this.hashCode(), makeBossHPBarPacket());
}
}
@@ -855,12 +852,7 @@ public class MapleMonster extends AbstractLoadedMapleLife {
statiLock.unlock();
}
monsterLock.lock();
try {
return stats.getEffectiveness(e);
} finally {
monsterLock.unlock();
}
return getMonsterEffectiveness(e);
}
private ElementalEffectiveness getMonsterEffectiveness(Element e) {
@@ -1478,6 +1470,15 @@ public class MapleMonster extends AbstractLoadedMapleLife {
}
public final void disposeLocks() {
LockCollector.getInstance().registerDisposeAction(new Runnable() {
@Override
public void run() {
emptyLocks();
}
});
}
private void emptyLocks() {
externalLock = externalLock.dispose();
monsterLock = monsterLock.dispose();
statiLock = statiLock.dispose();
src/server/maps/MapleDoor.java
+14 -15
View File
@@ -22,7 +22,6 @@
package server.maps;
import java.awt.Point;
import java.util.List;
import tools.Pair;
import server.MaplePortal;
@@ -43,7 +42,7 @@ public class MapleDoor {
private MapleDoorObject townDoor;
private MapleDoorObject areaDoor;
public MapleDoor(MapleCharacter owner, Point targetPosition) {
this.ownerId = owner.getId();
this.target = owner.getMap();
@@ -55,11 +54,11 @@ public class MapleDoor {
if(posStatus == null) {
this.town = this.target.getReturnMap();
this.townPortal = getDoorPortal(owner.getDoorSlot());
this.townPortal = getTownDoorPortal(owner.getDoorSlot());
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 = new MapleDoorObject(ownerId, town, target, townPortal.getId(), targetPosition, townPortal.getPosition());
this.townDoor = new MapleDoorObject(ownerId, target, town, -1, townPortal.getPosition(), targetPosition);
this.areaDoor.setPairOid(this.townDoor.getObjectId());
this.townDoor.setPairOid(this.areaDoor.getObjectId());
@@ -74,20 +73,20 @@ public class MapleDoor {
}
}
private MaplePortal getDoorPortal(int slot) {
List<MaplePortal> avail = town.getAvailableDoorPortals();
public void updateDoorPortal(MapleCharacter owner) {
int slot = owner.fetchDoorSlot();
try {
return avail.get(slot);
} catch (IndexOutOfBoundsException e) {
try {
return avail.get(0);
} catch (IndexOutOfBoundsException ex) {
return null;
}
MaplePortal nextTownPortal = getTownDoorPortal(slot);
if(nextTownPortal != null) {
townPortal = nextTownPortal;
areaDoor.update(nextTownPortal.getId(), nextTownPortal.getPosition());
}
}
private MaplePortal getTownDoorPortal(int doorid) {
return town.getDoorPortal(doorid);
}
public int getOwnerId() {
return ownerId;
}
src/server/maps/MapleDoorObject.java
+64 -16
View File
@@ -20,8 +20,11 @@
package server.maps;
import java.awt.Point;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import client.MapleCharacter;
import client.MapleClient;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
import tools.MaplePacketCreator;
/**
@@ -29,28 +32,66 @@ import tools.MaplePacketCreator;
* @author Ronan
*/
public class MapleDoorObject extends AbstractMapleMapObject {
private int ownerId;
private final int ownerId;
private int pairOid;
private boolean isTown;
private MapleMap from;
private MapleMap to;
private Point toPos;
private final MapleMap from;
private final MapleMap to;
private int linkedPortalId;
private Point linkedPos;
public MapleDoorObject(int owner, MapleMap destination, MapleMap origin, boolean town, Point targetPosition, Point toPosition) {
private final ReentrantReadWriteLock locks = new MonitoredReentrantReadWriteLock(MonitoredLockType.PLAYER_DOOR, true);
private ReentrantReadWriteLock.ReadLock rlock = locks.readLock();
private ReentrantReadWriteLock.WriteLock wlock = locks.writeLock();
public MapleDoorObject(int owner, MapleMap destination, MapleMap origin, int townPortalId, Point targetPosition, Point toPosition) {
super();
setPosition(targetPosition);
ownerId = owner;
isTown = town;
linkedPortalId = townPortalId;
from = origin;
to = destination;
toPos = toPosition;
linkedPos = toPosition;
}
public void update(int townPortalId, Point toPosition) {
wlock.lock();
try {
linkedPortalId = townPortalId;
linkedPos = toPosition;
} finally {
wlock.unlock();
}
}
private int getLinkedPortalId() {
rlock.lock();
try {
return linkedPortalId;
} finally {
rlock.unlock();
}
}
private Point getLinkedPortalPosition() {
rlock.lock();
try {
return linkedPos;
} finally {
rlock.unlock();
}
}
public void warp(final MapleCharacter chr) {
if (chr.getId() == ownerId || (chr.getParty() != null && chr.getParty().getMemberById(ownerId) != null)) {
chr.changeMap(to, toPos);
boolean onParty = chr.getParty() != null;
if (chr.getId() == ownerId || (onParty && chr.getParty().getMemberById(ownerId) != null)) {
if(!inTown() && !onParty) {
chr.changeMap(to, getLinkedPortalId());
} else {
chr.changeMap(to, getLinkedPortalPosition());
}
} else {
chr.getClient().announce(MaplePacketCreator.blockedMessage(6));
chr.getClient().announce(MaplePacketCreator.enableActions());
@@ -75,7 +116,14 @@ public class MapleDoorObject extends AbstractMapleMapObject {
if (client.getPlayer().getParty() != null && (ownerId == client.getPlayer().getId() || client.getPlayer().getParty().getMemberById(ownerId) != null)) {
client.announce(MaplePacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
}
client.announce(MaplePacketCreator.removeDoor(ownerId, isTown));
client.announce(MaplePacketCreator.removeDoor(ownerId, inTown()));
}
}
public void sendDestroyData(MapleClient client, boolean partyUpdate) {
if (client != null && from.getId() == client.getPlayer().getMapId()) {
client.announce(MaplePacketCreator.partyPortal(999999999, 999999999, new Point(-1, -1)));
client.announce(MaplePacketCreator.removeDoor(ownerId, inTown()));
}
}
@@ -92,7 +140,7 @@ public class MapleDoorObject extends AbstractMapleMapObject {
}
public boolean inTown() {
return isTown;
return getLinkedPortalId() == -1;
}
public MapleMap getFrom() {
@@ -104,19 +152,19 @@ public class MapleDoorObject extends AbstractMapleMapObject {
}
public MapleMap getTown() {
return isTown ? from : to;
return inTown() ? from : to;
}
public MapleMap getArea() {
return !isTown ? from : to;
return !inTown() ? from : to;
}
public Point getAreaPosition() {
return !isTown ? getPosition() : toPos;
return !inTown() ? getPosition() : getLinkedPortalPosition();
}
public Point toPosition() {
return toPos;
return getLinkedPortalPosition();
}
@Override
src/server/maps/MapleMap.java
+16 -22
View File
@@ -982,7 +982,7 @@ public class MapleMap {
}
private static boolean shouldShowQuestItem(MapleCharacter chr, int questid, int itemid) {
return questid <= 0 || (chr.getQuestStatus(questid) == 1 && chr.needQuestItem(questid, itemid));
return questid <= 0 || chr.needQuestItem(questid, itemid);
}
public void updatePlayerItemDrops(int partyid, int charid, List<MapleCharacter> partyMembers, MapleCharacter partyLeaver) {
@@ -1462,7 +1462,7 @@ public class MapleMap {
removeMapObject(reactor);
if (reactor.getDelay() > 0) {
TimerManager.getInstance().schedule(new Runnable() {
registerMapSchedule(new Runnable() {
@Override
public void run() {
respawnReactor(reactor);
@@ -1857,14 +1857,14 @@ public class MapleMap {
final selfDestruction selfDestruction = monster.getStats().selfDestruction();
if (monster.getStats().removeAfter() > 0 || selfDestruction != null && selfDestruction.getHp() < 0) {
if (selfDestruction == null) {
TimerManager.getInstance().schedule(new Runnable() {
registerMapSchedule(new Runnable() {
@Override
public void run() {
killMonster(monster, null, false);
}
}, monster.getStats().removeAfter() * 1000);
} else {
TimerManager.getInstance().schedule(new Runnable() {
registerMapSchedule(new Runnable() {
@Override
public void run() {
killMonster(monster, null, false, selfDestruction.getAction());
@@ -2037,23 +2037,16 @@ public class MapleMap {
});
}
public List<MaplePortal> getAvailableDoorPortals() {
objectRLock.lock();
try {
List<MaplePortal> availablePortals = new ArrayList<>();
for (MaplePortal port : portals.values()) {
if (port.getType() == MaplePortal.DOOR_PORTAL) {
availablePortals.add(port);
}
}
return availablePortals;
} finally {
objectRLock.unlock();
public MaplePortal getDoorPortal(int doorid) {
MaplePortal 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);
}
return doorPortal;
}
public void spawnSummon(final MapleSummon summon) {
spawnAndAddRangedMapObject(summon, new DelayedPacketCreation() {
@Override
@@ -2945,7 +2938,7 @@ public class MapleMap {
public MaplePortal getPortal(int portalid) {
return portals.get(portalid);
}
public void addMapleArea(Rectangle rec) {
areas.add(rec);
}
@@ -3323,8 +3316,9 @@ public class MapleMap {
reactor.hitReactor(c);
if (reactor.getDelay() > 0) {
TimerManager tMan = TimerManager.getInstance();
tMan.schedule(new Runnable() {
MapleMap reactorMap = reactor.getMap();
reactorMap.getChannelServer().registerOverallAction(reactorMap.getId(), new Runnable() {
@Override
public void run() {
reactor.lockReactor();
src/server/maps/MapleMapItem.java
+1 -1
View File
@@ -184,7 +184,7 @@ public class MapleMapItem extends AbstractMapleMapObject {
public void sendSpawnData(final MapleClient client) {
MapleCharacter chr = client.getPlayer();
if (questid <= 0 || (chr.getQuestStatus(questid) == 1 && chr.needQuestItem(questid, item.getItemId()))) {
if (questid <= 0 || chr.needQuestItem(questid, item.getItemId())) {
this.lockItem();
try {
client.announce(MaplePacketCreator.dropItemFromMapObject(chr.getParty() != null, this, null, getPosition(), (byte) 2));
src/server/quest/actions/ExpAction.java
+9 -5
View File
@@ -48,14 +48,18 @@ public class ExpAction extends MapleQuestAction {
@Override
public void run(MapleCharacter chr, Integer extSelection) {
if (chr.isBeginnerJob() && chr.getLevel() < 10) {
chr.gainExp(exp, true, true);
runAction(chr, exp);
}
public static void runAction(MapleCharacter chr, int gain) {
if (chr.isBeginnerJob() && chr.getLevel() < 10) {
chr.gainExp(gain, true, true);
} else {
if(!ServerConstants.USE_QUEST_RATE) {
chr.gainExp(exp * chr.getExpRate(), true, true);
chr.gainExp(gain * chr.getExpRate(), true, true);
} else {
chr.gainExp(exp * ServerConstants.EXP_RATE * ServerConstants.QUEST_RATE, true, true);
chr.gainExp(gain * ServerConstants.EXP_RATE * ServerConstants.QUEST_RATE, true, true);
}
}
}
}
}
src/server/quest/actions/MesoAction.java
+9 -5
View File
@@ -49,14 +49,18 @@ public class MesoAction extends MapleQuestAction {
@Override
public void run(MapleCharacter chr, Integer extSelection) {
if(mesos < 0) {
chr.gainMeso(mesos, true, false, true);
runAction(chr, mesos);
}
public static void runAction(MapleCharacter chr, int gain) {
if(gain < 0) {
chr.gainMeso(gain, true, false, true);
} else {
if(!ServerConstants.USE_QUEST_RATE) {
chr.gainMeso(mesos * chr.getMesoRate(), true, false, true);
chr.gainMeso(gain * chr.getMesoRate(), true, false, true);
} else {
chr.gainMeso(mesos * ServerConstants.MESO_RATE * ServerConstants.QUEST_RATE, true, false, true);
chr.gainMeso(gain * ServerConstants.MESO_RATE * ServerConstants.QUEST_RATE, true, false, true);
}
}
}
}
}