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

Turn map id magic numbers into constants

Browse Source
This commit is contained in:
P0nk
2021-11-07 14:26:34 +01:00
parent c022c3595f
commit b15a7e61d4
51 changed files with 615 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/tools/PacketCreator.java
View File

@@ -34,6 +34,7 @@ import config.YamlConfig;
import constants.game.ExpTable;
import constants.game.GameConstants;
import constants.id.ItemId;
import constants.id.MapId;
import constants.id.NpcId;
import constants.inventory.ItemConstants;
import constants.skills.Buccaneer;
@@ -1079,8 +1080,8 @@ public class PacketCreator {
final OutPacket p;
if (town) {
p = OutPacket.create(SendOpcode.SPAWN_PORTAL);
p.writeInt(999999999);
p.writeInt(999999999);
p.writeInt(MapId.NONE);
p.writeInt(MapId.NONE);
} else {
p = OutPacket.create(SendOpcode.REMOVE_DOOR);
p.writeByte(0);
@@ -3700,14 +3701,14 @@ public class PacketCreator {
p.writeInt(mdo.getPosition().x);
p.writeInt(mdo.getPosition().y);
} else {
p.writeInt(999999999);
p.writeInt(999999999);
p.writeInt(MapId.NONE);
p.writeInt(MapId.NONE);
p.writeInt(0);
p.writeInt(0);
}
} else {
p.writeInt(999999999);
p.writeInt(999999999);
p.writeInt(MapId.NONE);
p.writeInt(MapId.NONE);
p.writeInt(0);
p.writeInt(0);
}
@@ -3811,20 +3812,20 @@ public class PacketCreator {
p.writeInt(mdo.getPosition().x);
p.writeInt(mdo.getPosition().y);
} else {
p.writeInt(999999999);
p.writeInt(999999999);
p.writeInt(MapId.NONE);
p.writeInt(MapId.NONE);
p.writeInt(0);
p.writeInt(0);
}
} else {
p.writeInt(999999999);
p.writeInt(999999999);
p.writeInt(MapId.NONE);
p.writeInt(MapId.NONE);
p.writeInt(0);
p.writeInt(0);
}
} else {
p.writeInt(999999999);
p.writeInt(999999999);
p.writeInt(MapId.NONE);
p.writeInt(MapId.NONE);
p.writeInt(0);
p.writeInt(0);
}

4
src/main/java/tools/packets/Fishing.java
View File

@@ -21,8 +21,8 @@ package tools.packets;
import client.Character;
import config.YamlConfig;
import constants.game.GameConstants;
import constants.id.ItemId;
import constants.id.MapId;
import constants.inventory.ItemConstants;
import server.ItemInformationProvider;
import tools.PacketCreator;
@@ -72,7 +72,7 @@ public class Fishing {
return;
}
if (!GameConstants.isFishingArea(chr.getMapId())) {
if (!MapId.isFishingArea(chr.getMapId())) {
chr.dropMessage("You are not in a fishing area!");
return;
}

11
src/main/java/tools/packets/WeddingPackets.java
View File

@@ -9,6 +9,7 @@ package tools.packets;
import client.Character;
import client.inventory.Item;
import constants.id.ItemId;
import constants.id.MapId;
import net.opcodes.SendOpcode;
import net.packet.OutPacket;
import net.packet.Packet;
@@ -139,11 +140,11 @@ public class WeddingPackets extends PacketCreator {
}
public enum WeddingMap {
WEDDINGTOWN(680000000),
CHAPEL_STARTMAP(680000110),
CATHEDRAL_STARTMAP(680000210),
PHOTOMAP(680000300),
EXITMAP(680000500);
WEDDINGTOWN(MapId.AMORIA),
CHAPEL_STARTMAP(MapId.CHAPEL_WEDDING_ALTAR),
CATHEDRAL_STARTMAP(MapId.CATHEDRAL_WEDDING_ALTAR),
PHOTOMAP(MapId.WEDDING_PHOTO),
EXITMAP(MapId.WEDDING_EXIT);
private final int wm;
WeddingMap(int wm) {