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

4
src/main/java/client/Client.java
View File

@@ -61,7 +61,7 @@ import server.TimerManager;
import server.life.Monster;
import server.maps.FieldLimit;
import server.maps.MapleMap;
import server.maps.MapleMiniDungeonInfo;
import server.maps.MiniDungeonInfo;
import tools.*;
import javax.script.ScriptEngine;
@@ -1460,7 +1460,7 @@ public class Client extends ChannelInboundHandlerAdapter {
if (!player.isAlive() || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
sendPacket(PacketCreator.enableActions());
return;
} else if (MapleMiniDungeonInfo.isDungeonMap(player.getMapId())) {
} else if (MiniDungeonInfo.isDungeonMap(player.getMapId())) {
sendPacket(PacketCreator.serverNotice(5, "Changing channels or entering Cash Shop or MTS are disabled when inside a Mini-Dungeon."));
sendPacket(PacketCreator.enableActions());
return;

2
src/main/java/client/command/commands/gm1/GotoCommand.java
View File

@@ -90,7 +90,7 @@ public class GotoCommand extends Command {
}
if (!player.isGM()) {
if (player.getEventInstance() != null || MapleMiniDungeonInfo.isDungeonMap(player.getMapId()) || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
if (player.getEventInstance() != null || MiniDungeonInfo.isDungeonMap(player.getMapId()) || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
player.dropMessage(1, "This command can not be used in this map.");
return;
}

4
src/main/java/client/command/commands/gm2/WarpCommand.java
View File

@@ -28,7 +28,7 @@ import client.Client;
import client.command.Command;
import server.maps.FieldLimit;
import server.maps.MapleMap;
import server.maps.MapleMiniDungeonInfo;
import server.maps.MiniDungeonInfo;
public class WarpCommand extends Command {
{
@@ -56,7 +56,7 @@ public class WarpCommand extends Command {
}
if (!player.isGM()) {
if (player.getEventInstance() != null || MapleMiniDungeonInfo.isDungeonMap(player.getMapId()) || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
if (player.getEventInstance() != null || MiniDungeonInfo.isDungeonMap(player.getMapId()) || FieldLimit.CANNOTMIGRATE.check(player.getMap().getFieldLimit())) {
player.dropMessage(1, "This command cannot be used in this map.");
return;
}