Sweetgum/sweetgum-server
1
0
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

42
src/scripting/event/EventInstanceManager.java
View File

@@ -35,6 +35,7 @@ import java.util.Set;
import java.util.Iterator;
import java.util.Properties;
import javax.script.ScriptException;
import net.server.audit.LockCollector;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
@@ -232,12 +233,11 @@ public class EventInstanceManager {
wL.lock();
try {
chars.put(chr.getId(), chr);
chr.setEventInstance(this);
} finally {
wL.unlock();
}
chr.setEventInstance(this);
sL.lock();
try {
em.getIv().invokeFunction("playerEntry", this, chr);
@@ -403,14 +403,13 @@ public class EventInstanceManager {
wL.lock();
try {
chars.remove(chr.getId());
chr.setEventInstance(null);
} finally {
wL.unlock();
}
gridRemove(chr);
dropExclusiveItems(chr);
chr.setEventInstance(null);
}
public int getPlayerCount() {
@@ -635,6 +634,13 @@ public class EventInstanceManager {
}
public void dispose() {
rL.lock();
try {
for(MapleCharacter chr: chars.values()) chr.setEventInstance(null);
} finally {
rL.unlock();
}
Thread t = new Thread( new Runnable() {
@Override
public void run() {
@@ -645,7 +651,7 @@ public class EventInstanceManager {
t.start();
}
public synchronized void dispose(boolean shutdown) {
public synchronized void dispose(boolean shutdown) { // should not trigger any event script method after disposed
if(disposed) return;
disposed = true;
@@ -660,14 +666,12 @@ public class EventInstanceManager {
ex.printStackTrace();
}
mapFactory.dispose();
wL.lock();
try {
for(MapleCharacter chr: chars.values()) chr.setEventInstance(null);
chars.clear();
mobs.clear();
mapFactory.dispose();
mapFactory = null;
} finally {
wL.unlock();
@@ -696,6 +700,15 @@ public class EventInstanceManager {
}
private void disposeLocks() {
LockCollector.getInstance().registerDisposeAction(new Runnable() {
@Override
public void run() {
emptyLocks();
}
});
}
private void emptyLocks() {
pL = pL.dispose();
sL = sL.dispose();
}
@@ -878,9 +891,9 @@ public class EventInstanceManager {
return (chr.getId() == getLeaderId());
}
public final MapleMap getInstanceMap(final int mapid) { //gets instance map from the channelserv
public final MapleMap getInstanceMap(final int mapid) {
if (disposed) {
return getMapFactory().getMap(mapid);
return null;
}
mapIds.add(mapid);
return getMapFactory().getMap(mapid);
@@ -1310,15 +1323,20 @@ public class EventInstanceManager {
}
public final void recoverOpenedGate(MapleCharacter chr, int thisMapId) {
Pair<String, Integer> gateData = null;
rL.lock();
try {
if(openedGates.containsKey(thisMapId)) {
Pair<String, Integer> gateData = openedGates.get(thisMapId);
chr.announce(MaplePacketCreator.environmentChange(gateData.getLeft(), gateData.getRight()));
gateData = openedGates.get(thisMapId);
}
} finally {
rL.unlock();
}
if(gateData != null) {
chr.announce(MaplePacketCreator.environmentChange(gateData.getLeft(), gateData.getRight()));
}
}
public final void giveEventPlayersStageReward(int thisStage) {

38
src/scripting/event/EventManager.java
View File

@@ -52,6 +52,7 @@ import java.util.List;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.Queue;
import net.server.audit.LockCollector;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
@@ -131,6 +132,15 @@ public class EventManager {
}
private void disposeLocks() {
LockCollector.getInstance().registerDisposeAction(new Runnable() {
@Override
public void run() {
emptyLocks();
}
});
}
private void emptyLocks() {
lobbyLock = lobbyLock.dispose();
queueLock = queueLock.dispose();
}
@@ -333,7 +343,9 @@ public class EventManager {
EventInstanceManager eim = (EventInstanceManager) (iv.invokeFunction("setup", leader.getClient().getChannel()));
if(eim == null) {
if(lobbyId > -1) setLockLobby(lobbyId, false);
if(lobbyId > -1) {
setLockLobby(lobbyId, false);
}
return false;
}
instanceLocks.put(eim.getName(), lobbyId);
@@ -363,15 +375,21 @@ public class EventManager {
try {
if(lobbyId == -1) {
lobbyId = availableLobbyInstance();
if(lobbyId == -1) return false;
if(lobbyId == -1) {
return false;
}
}
else {
if(!startLobbyInstance(lobbyId)) return false;
if(!startLobbyInstance(lobbyId)) {
return false;
}
}
EventInstanceManager eim = (EventInstanceManager) (iv.invokeFunction("setup", difficulty, (lobbyId > -1) ? lobbyId : leader.getId()));
if(eim == null) {
if(lobbyId > -1) setLockLobby(lobbyId, false);
if(lobbyId > -1) {
setLockLobby(lobbyId, false);
}
return false;
}
instanceLocks.put(eim.getName(), lobbyId);
@@ -408,7 +426,9 @@ public class EventManager {
EventInstanceManager eim = (EventInstanceManager) (iv.invokeFunction("setup", (Object) null));
if(eim == null) {
if(lobbyId > -1) setLockLobby(lobbyId, false);
if(lobbyId > -1) {
setLockLobby(lobbyId, false);
}
return false;
}
instanceLocks.put(eim.getName(), lobbyId);
@@ -446,7 +466,9 @@ public class EventManager {
EventInstanceManager eim = (EventInstanceManager) (iv.invokeFunction("setup", difficulty, (lobbyId > -1) ? lobbyId : party.getLeaderId()));
if(eim == null) {
if(lobbyId > -1) setLockLobby(lobbyId, false);
if(lobbyId > -1) {
setLockLobby(lobbyId, false);
}
return false;
}
instanceLocks.put(eim.getName(), lobbyId);
@@ -487,7 +509,9 @@ public class EventManager {
}
if(eim == null) {
if(lobbyId > -1) setLockLobby(lobbyId, false);
if(lobbyId > -1) {
setLockLobby(lobbyId, false);
}
return false;
}
instanceLocks.put(eim.getName(), lobbyId);

16
src/scripting/event/worker/EventScriptScheduler.java
View File

@@ -28,6 +28,7 @@ import java.util.Map.Entry;
import java.util.concurrent.ScheduledFuture;
import server.TimerManager;
import net.server.Server;
import net.server.audit.LockCollector;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReentrantLock;
import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
@@ -161,10 +162,23 @@ public class EventScriptScheduler {
schedulerLock.unlock();
}
schedulerLock = schedulerLock.dispose();
disposeLocks();
}
});
t.start();
}
private void disposeLocks() {
LockCollector.getInstance().registerDisposeAction(new Runnable() {
@Override
public void run() {
emptyLocks();
}
});
}
private void emptyLocks() {
schedulerLock = schedulerLock.dispose();
}
}

12
src/scripting/quest/QuestActionManager.java
View File

@@ -25,6 +25,8 @@ import client.MapleClient;
import scripting.npc.NPCConversationManager;
import server.MapleItemInformationProvider;
import server.quest.MapleQuest;
import server.quest.actions.ExpAction;
import server.quest.actions.MesoAction;
/**
*
@@ -71,6 +73,16 @@ public class QuestActionManager extends NPCConversationManager {
forceCompleteQuest();
}
@Override
public void gainExp(int gain) {
ExpAction.runAction(getPlayer(), gain);
}
@Override
public void gainMeso(int gain) {
MesoAction.runAction(getPlayer(), gain);
}
public String getMedalName() { // usable only for medal quests (id 299XX)
MapleQuest q = MapleQuest.getInstance(quest);
return MapleItemInformationProvider.getInstance().getName(q.getMedalRequirement());