From 3a0ea6fc779053a1a0f9fc79b7ffe2315763a6b7 Mon Sep 17 00:00:00 2001 From: MedicOP Date: Mon, 21 Jan 2019 02:29:40 +0100 Subject: [PATCH] Fix channel dojo methods getting invalid Map ID (#351) --- src/net/server/channel/Channel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/net/server/channel/Channel.java b/src/net/server/channel/Channel.java index 02f08c9a68..2a84b75d1a 100644 --- a/src/net/server/channel/Channel.java +++ b/src/net/server/channel/Channel.java @@ -595,6 +595,9 @@ public final class Channel { final int dojoBaseMap = (dojoMapId >= 925030000) ? 925030000 : 925020000; 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); if(!dojoMap.getAllPlayers().isEmpty()) return; } @@ -616,6 +619,9 @@ public final class Channel { MapleParty party = null; 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()) { if(chr.getMap().isDojoMap()) { chr.timeoutFromDojo();