lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper ids for ExSetCompassZoneCode.

Browse Source 
Thanks to aviengier.
This commit is contained in:
MobiusDevelopment
2021-12-13 22:28:29 +00:00
parent 63c6248cac
commit 35ff999706
4 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -1860,12 +1860,12 @@ public class Player extends Playable
} }
else if (isInsideZone(ZoneId.SIEGE)) else if (isInsideZone(ZoneId.SIEGE))
{ {
if (_lastCompassZone == ExSetCompassZoneCode.SIEGEWARZONE2) if (_lastCompassZone == ExSetCompassZoneCode.SIEGEWARZONE)
{ {
return; return;
} }
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2; _lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE;
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2)); sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE));
} }
else if (isInsideZone(ZoneId.PVP)) else if (isInsideZone(ZoneId.PVP))
{ {
@@ -1900,7 +1900,7 @@ public class Player extends Playable
{ {
return; return;
} }
if (_lastCompassZone == ExSetCompassZoneCode.SIEGEWARZONE2) if (_lastCompassZone == ExSetCompassZoneCode.SIEGEWARZONE)
{ {
updatePvPStatus(); updatePvPStatus();
} }

17
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java
View File

@@ -24,16 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
*/ */
public class ExSetCompassZoneCode implements IClientOutgoingPacket public class ExSetCompassZoneCode implements IClientOutgoingPacket
{ {
// TODO: Enum public static final int ALTEREDZONE = 7;
public static final int ALTEREDZONE = 0x08; public static final int SIEGEWARZONE = 10;
public static final int SIEGEWARZONE1 = 0x0A; public static final int PEACEZONE = 11;
public static final int SIEGEWARZONE2 = 0x0B; public static final int SEVENSIGNSZONE = 12;
public static final int PEACEZONE = 0x0C; public static final int NOPVPZONE = 13;
public static final int SEVENSIGNSZONE = 0x0D; public static final int PVPZONE = 14;
public static final int PVPZONE = 0x0E; public static final int GENERALZONE = 15;
public static final int GENERALZONE = 0x0F;
// TODO: need to find the desired value
public static final int NOPVPZONE = 0x0C;
private final int _zoneType; private final int _zoneType;

8
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -1898,12 +1898,12 @@ public class Player extends Playable
} }
else if (isInsideZone(ZoneId.SIEGE)) else if (isInsideZone(ZoneId.SIEGE))
{ {
if (_lastCompassZone == ExSetCompassZoneCode.SIEGEWARZONE2) if (_lastCompassZone == ExSetCompassZoneCode.SIEGEWARZONE)
{ {
return; return;
} }
_lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2; _lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE;
sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2)); sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE));
} }
else if (isInsideZone(ZoneId.PVP)) else if (isInsideZone(ZoneId.PVP))
{ {
@@ -1938,7 +1938,7 @@ public class Player extends Playable
{ {
return; return;
} }
if (_lastCompassZone == ExSetCompassZoneCode.SIEGEWARZONE2) if (_lastCompassZone == ExSetCompassZoneCode.SIEGEWARZONE)
{ {
updatePvPStatus(); updatePvPStatus();
} }

17
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java
View File

@@ -24,16 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
*/ */
public class ExSetCompassZoneCode implements IClientOutgoingPacket public class ExSetCompassZoneCode implements IClientOutgoingPacket
{ {
// TODO: Enum public static final int ALTEREDZONE = 7;
public static final int ALTEREDZONE = 0x08; public static final int SIEGEWARZONE = 10;
public static final int SIEGEWARZONE1 = 0x0A; public static final int PEACEZONE = 11;
public static final int SIEGEWARZONE2 = 0x0B; public static final int SEVENSIGNSZONE = 12;
public static final int PEACEZONE = 0x0C; public static final int NOPVPZONE = 13;
public static final int SEVENSIGNSZONE = 0x0D; public static final int PVPZONE = 14;
public static final int PVPZONE = 0x0E; public static final int GENERALZONE = 15;
public static final int GENERALZONE = 0x0F;
// TODO: need to find the desired value
public static final int NOPVPZONE = 0x0C;
private final int _zoneType; private final int _zoneType;