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

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

@@ -524,12 +524,7 @@ public class EventInstanceManager {
cancelSchedule();
killCount.clear();
if (expedition != null) {
expedition.dispose(true);
em.getChannelServer().getExpeditions().remove(expedition);
expedition = null;
}
disposeExpedition();
if(!eventCleared) em.disposeInstance(name);
em = null;
}
@@ -863,9 +858,19 @@ public class EventInstanceManager {
}
}
private void disposeExpedition() {
if (expedition != null) {
expedition.dispose(eventCleared);
em.getChannelServer().getExpeditions().remove(expedition);
expedition = null;
}
}
public final void setEventCleared() {
eventCleared = true;
em.disposeInstance(name);
disposeExpedition();
}
public final boolean isEventCleared() {