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

Fix channel dojo methods getting invalid Map ID (#351)

Browse Source
This commit is contained in:
MedicOP
2019-01-21 02:29:40 +01:00
committed by Ronan Lana
parent 7ebc99a6fc
commit 3a0ea6fc77
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/server/channel/Channel.java
View File

@@ -595,6 +595,9 @@ public final class Channel {
final int dojoBaseMap = (dojoMapId >= 925030000) ? 925030000 : 925020000; final int dojoBaseMap = (dojoMapId >= 925030000) ? 925030000 : 925020000;
for (int i = 0; i < 5; i++) { //only 32 stages, but 38 maps for (int i = 0; i < 5; i++) { //only 32 stages, but 38 maps
if (stage + i > 38) {
break;
}
MapleMap dojoMap = getMapFactory().getMap(dojoBaseMap + (100 * (stage + i)) + delta); MapleMap dojoMap = getMapFactory().getMap(dojoBaseMap + (100 * (stage + i)) + delta);
if(!dojoMap.getAllPlayers().isEmpty()) return; if(!dojoMap.getAllPlayers().isEmpty()) return;
} }
@@ -616,6 +619,9 @@ public final class Channel {
MapleParty party = null; MapleParty party = null;
for (int i = 0; i < 5; i++) { //only 32 stages, but 38 maps for (int i = 0; i < 5; i++) { //only 32 stages, but 38 maps
if (stage + i > 38) {
break;
}
for(MapleCharacter chr: getMapFactory().getMap(dojoBaseMap + (100 * (stage + i)) + delta).getAllPlayers()) { for(MapleCharacter chr: getMapFactory().getMap(dojoBaseMap + (100 * (stage + i)) + delta).getAllPlayers()) {
if(chr.getMap().isDojoMap()) { if(chr.getMap().isDojoMap()) {
chr.timeoutFromDojo(); chr.timeoutFromDojo();