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

Rename and clean up MapleMiniDungeonInfo

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:33:09 +02:00
parent 867624f980
commit b62ee8c8e2
10 changed files with 97 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/server/channel/Channel.java
View File

@@ -658,7 +658,7 @@ public final class Channel {
try {
if(dungeons.containsKey(dungeonid)) return false;
MapleMiniDungeonInfo mmdi = MapleMiniDungeonInfo.getDungeon(dungeonid);
MiniDungeonInfo mmdi = MiniDungeonInfo.getDungeon(dungeonid);
MiniDungeon mmd = new MiniDungeon(mmdi.getBase(), this.getMapFactory().getMap(mmdi.getDungeonId()).getTimeLimit()); // thanks Conrad for noticing hardcoded time limit for minidungeons
dungeons.put(dungeonid, mmd);

4
src/main/java/net/server/channel/handlers/EnterCashShopHandler.java
View File

@@ -26,7 +26,7 @@ import client.Client;
import net.AbstractPacketHandler;
import net.packet.InPacket;
import net.server.Server;
import server.maps.MapleMiniDungeonInfo;
import server.maps.MiniDungeonInfo;
import tools.PacketCreator;
/**
@@ -50,7 +50,7 @@ public class EnterCashShopHandler extends AbstractPacketHandler {
return;
}
if(MapleMiniDungeonInfo.isDungeonMap(mc.getMapId())) {
if(MiniDungeonInfo.isDungeonMap(mc.getMapId())) {
c.sendPacket(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
c.sendPacket(PacketCreator.enableActions());
return;

4
src/main/java/net/server/channel/handlers/EnterMTSHandler.java
View File

@@ -32,7 +32,7 @@ import net.packet.InPacket;
import net.server.Server;
import server.MTSItemInfo;
import server.maps.FieldLimit;
import server.maps.MapleMiniDungeonInfo;
import server.maps.MiniDungeonInfo;
import tools.DatabaseConnection;
import tools.PacketCreator;
@@ -64,7 +64,7 @@ public final class EnterMTSHandler extends AbstractPacketHandler {
return;
}
if(MapleMiniDungeonInfo.isDungeonMap(chr.getMapId())) {
if(MiniDungeonInfo.isDungeonMap(chr.getMapId())) {
c.sendPacket(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
c.sendPacket(PacketCreator.enableActions());
return;