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

Event disposing patch + Papulatus rework + V. scroll exploit patch

Browse Source 
Solved issues with PQs/events in progress not disposing properly party leavers (warping them out of the event maps).
Solved issues with cleared PQs/events disposing players unproperly when leaving or disbanding the party.
Reworked Papulatus battle now working as an event instance, similar to how Capt Latanica battle is dealt.
Fixed a possible PE exploit with Vega's scroll.
This commit is contained in:
ronancpl
2018-02-17 00:07:10 -02:00
parent 278b5e8140
commit 8f76e7be25
43 changed files with 910 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,7 @@ public class EventInstanceManager {
private ScheduledFuture<?> event_schedule = null;
private boolean disposed = false;
private boolean eventCleared = false;
private boolean eventStarted = false;
// multi-leveled PQ rewards!
private Map<Integer, List<Integer>> collectionSet = new HashMap<>(ServerConstants.MAX_EVENT_LEVELS);
@@ -507,18 +508,20 @@ public class EventInstanceManager {
try {
mobs.remove(mob);
try {
em.getIv().invokeFunction("monsterKilled", mob, this, hasKiller);
} catch (ScriptException | NoSuchMethodException ex) {
ex.printStackTrace();
}
if (mobs.isEmpty()) {
if(eventStarted) {
try {
em.getIv().invokeFunction("allMonstersDead", this, hasKiller);
em.getIv().invokeFunction("monsterKilled", mob, this, hasKiller);
} catch (ScriptException | NoSuchMethodException ex) {
ex.printStackTrace();
}
if (mobs.isEmpty()) {
try {
em.getIv().invokeFunction("allMonstersDead", this, hasKiller);
} catch (ScriptException | NoSuchMethodException ex) {
ex.printStackTrace();
}
}
}
} finally {
sL.unlock();
@@ -1072,6 +1075,20 @@ public class EventInstanceManager {
}
}
public final void startEvent() {
try {
sL.lock();
try {
eventStarted = true;
em.getIv().invokeFunction("afterSetup", this);
} finally {
sL.unlock();
}
} catch (ScriptException | NoSuchMethodException ex) {
ex.printStackTrace();
}
}
public final void setEventCleared() {
eventCleared = true;
@@ -1097,20 +1114,20 @@ public class EventInstanceManager {
return false;
}
public final boolean checkEventTeamLacking(boolean testLeader, int minPlayers) {
public final boolean checkEventTeamLacking(boolean leavingEventMap, int minPlayers) {
if(eventCleared && getPlayerCount() > 1) return false;
if(!eventCleared && testLeader && !isEventTeamLeaderOn()) return true;
if(!eventCleared && leavingEventMap && !isEventTeamLeaderOn()) return true;
if(getPlayerCount() < minPlayers) return true;
return false;
}
public final boolean isEventTeamLackingNow(boolean testLeader, int minPlayers, MapleCharacter quitter) {
public final boolean isEventTeamLackingNow(boolean leavingEventMap, int minPlayers, MapleCharacter quitter) {
if(eventCleared) {
if(getPlayerCount() <= 1) return true;
if(leavingEventMap && getPlayerCount() <= 1) return true;
} else {
if(testLeader && getLeaderId() == quitter.getId()) return true;
if(leavingEventMap && getLeaderId() == quitter.getId()) return true;
if(getPlayerCount() <= minPlayers) return true;
}

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

@@ -298,7 +298,7 @@ public class EventManager {
exped.start();
eim.registerExpedition(exped);
iv.invokeFunction("afterSetup", eim);
eim.startEvent();
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -334,7 +334,8 @@ public class EventManager {
eim.setLeader(leader);
if(chr != null) eim.registerPlayer(chr);
iv.invokeFunction("afterSetup", eim);
eim.startEvent();
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -371,7 +372,8 @@ public class EventManager {
eim.registerParty(party, map);
party.setEligibleMembers(null);
iv.invokeFunction("afterSetup", eim);
eim.startEvent();
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -408,7 +410,8 @@ public class EventManager {
eim.registerParty(party, map);
party.setEligibleMembers(null);
iv.invokeFunction("afterSetup", eim);
eim.startEvent();
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -448,7 +451,8 @@ public class EventManager {
iv.invokeFunction("setup", eim);
eim.setProperty("leader", ldr);
iv.invokeFunction("afterSetup", eim);
eim.startEvent();
} catch (ScriptException | NoSuchMethodException ex) {
Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex);
}