diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg b/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg deleted file mode 100644 index a1e02ab4d1..0000000000 --- a/L2J_Mobius_C6_Interlude/dist/game/config/olympiad.cfg +++ /dev/null @@ -1,9 +0,0 @@ -#Olympiad Properties -#Tue Aug 20 13:40:12 EEST 2019 -NextWeeklyChange_DateFormat=27 \u0391\u03C5\u03B3 2019, 1\:35\:34 \u03BC.\u03BC. -ValdationEnd=0 -NextWeeklyChange=1566902134230 -Period=0 -CurrentCycle=1 -OlympiadEnd=1567328400230 -OlympiadEnd_DateFormat=1 \u03A3\u03B5\u03C0 2019, 12\:00\:00 \u03BC.\u03BC. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/MapRegionTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/MapRegionTable.java index 3c5b56d965..80af5bee80 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/MapRegionTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/MapRegionTable.java @@ -485,7 +485,7 @@ public class MapRegionTable final PlayerInstance player = (PlayerInstance) creature; // If in Monster Derby Track - if (player.isInsideZone(ZoneId.MONSTERTRACK)) + if (player.isInsideZone(ZoneId.MONSTER_TRACK)) { return new Location(12661, 181687, -3560); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminZone.java index 57f68f8589..cb73674dd9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminZone.java @@ -54,7 +54,7 @@ public class AdminZone implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "This is NOT a PvP zone."); } - if (activeChar.isInsideZone(ZoneId.NOLANDING)) + if (activeChar.isInsideZone(ZoneId.NO_LANDING)) { BuilderUtil.sendSysMessage(activeChar, "This is a no landing zone."); } @@ -63,7 +63,7 @@ public class AdminZone implements IAdminCommandHandler BuilderUtil.sendSysMessage(activeChar, "This is NOT a no landing zone."); } - if (activeChar.isInsideZone(ZoneId.NOSTORE)) + if (activeChar.isInsideZone(ZoneId.NO_STORE)) { BuilderUtil.sendSysMessage(activeChar, "This is a no-store zone."); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java index 7c89d633bf..3e5aec9e85 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java @@ -52,7 +52,7 @@ public class ClanGate implements ISkillHandler return; } - if (player.isInFunEvent() || player.isInsideZone(ZoneId.NOLANDING) || player.isInOlympiadMode() || player.isInsideZone(ZoneId.PVP) || (GrandBossManager.getInstance().getZone(player) != null)) + if (player.isInFunEvent() || player.isInsideZone(ZoneId.NO_LANDING) || player.isInOlympiadMode() || player.isInsideZone(ZoneId.PVP) || (GrandBossManager.getInstance().getZone(player) != null)) { player.sendMessage("Cannot open the portal here."); return; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java index 63c95fecbc..1edaeeaa6d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java @@ -168,7 +168,7 @@ public class SiegeFlag implements ISkillHandler { sm.addString("You have already placed the maximum number of flags possible"); } - else if (player.isInsideZone(ZoneId.NOHQ)) + else if (player.isInsideZone(ZoneId.NO_HQ)) { sm.addString("You cannot place flag here."); } @@ -214,7 +214,7 @@ public class SiegeFlag implements ISkillHandler { sm.addString("You have already placed the maximum number of flags possible"); } - else if (player.isInsideZone(ZoneId.NOHQ)) + else if (player.isInsideZone(ZoneId.NO_HQ)) { sm.addString("You cannot place flag here."); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java index 96e60102cb..a00333beb0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java @@ -373,7 +373,7 @@ public class Wedding implements IVoicedCommandHandler activeChar.sendMessage("You have a cursed weapon, you can't go to your partner."); return false; } - else if (activeChar.isInsideZone(ZoneId.NOSUMMONFRIEND)) + else if (activeChar.isInsideZone(ZoneId.NO_SUMMON_FRIEND)) { activeChar.sendMessage("You are in area which blocks summoning."); return false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleMagicianInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleMagicianInstance.java index 94a4b73e5d..9571d7ac41 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleMagicianInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleMagicianInstance.java @@ -154,7 +154,7 @@ public class CastleMagicianInstance extends NpcInstance */ private static final boolean validateGateCondition(PlayerInstance clanLeader, PlayerInstance player) { - if (clanLeader.isAlikeDead() || clanLeader.isInStoreMode() || clanLeader.isRooted() || clanLeader.isInCombat() || clanLeader.isInOlympiadMode() || clanLeader.isFestivalParticipant() || clanLeader.inObserverMode() || clanLeader.isInsideZone(ZoneId.NOSUMMONFRIEND)) + if (clanLeader.isAlikeDead() || clanLeader.isInStoreMode() || clanLeader.isRooted() || clanLeader.isInCombat() || clanLeader.isInOlympiadMode() || clanLeader.isFestivalParticipant() || clanLeader.inObserverMode() || clanLeader.isInsideZone(ZoneId.NO_SUMMON_FRIEND)) { player.sendMessage("Couldn't teleport to clan leader. The requirements was not meet."); return false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 6f9b7b92a2..b70ac589d4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -11767,7 +11767,7 @@ public class PlayerInstance extends Playable public boolean checkLandingState() { // Check if char is in a no landing zone - if (isInsideZone(ZoneId.NOLANDING)) + if (isInsideZone(ZoneId.NO_LANDING)) { return true; } @@ -14636,7 +14636,7 @@ public class PlayerInstance extends Playable return false; } - if (summonerChar.isInsideZone(ZoneId.NOSUMMONFRIEND) || summonerChar.isFlying() || summonerChar.isMounted()) + if (summonerChar.isInsideZone(ZoneId.NO_SUMMON_FRIEND) || summonerChar.isFlying() || summonerChar.isMounted()) { summonerChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING)); return false; @@ -14697,7 +14697,7 @@ public class PlayerInstance extends Playable return false; } - if (targetChar.isInsideZone(ZoneId.NOSUMMONFRIEND)) + if (targetChar.isInsideZone(ZoneId.NO_SUMMON_FRIEND)) { return false; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneId.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneId.java index f2bfee82c2..84731db849 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneId.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/ZoneId.java @@ -26,18 +26,18 @@ public enum ZoneId PEACE, SIEGE, MOTHERTREE, - CLANHALL, + CLAN_HALL, UNUSED, - NOLANDING, + NO_LANDING, WATER, JAIL, - MONSTERTRACK, + MONSTER_TRACK, SWAMP, - NOSUMMONFRIEND, - OLY, - NOHQ, - DANGERAREA, - NOSTORE; + NO_SUMMON_FRIEND, + OLYMPIAD, + NO_HQ, + DANGER_AREA, + NO_STORE; public static int getZoneCount() { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleTeleportZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleTeleportZone.java index d9a4401299..e61e06003c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleTeleportZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/CastleTeleportZone.java @@ -89,13 +89,13 @@ public class CastleTeleportZone extends ZoneType @Override protected void onEnter(Creature creature) { - creature.setInsideZone(ZoneId.OLY, true); + creature.setInsideZone(ZoneId.OLYMPIAD, true); } @Override protected void onExit(Creature creature) { - creature.setInsideZone(ZoneId.OLY, false); + creature.setInsideZone(ZoneId.OLYMPIAD, false); } @Override diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index 7c7c9b1ad0..ffa76d7ce2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -85,7 +85,7 @@ public class ClanHallZone extends ZoneType if (creature instanceof PlayerInstance) { // Set as in clan hall - creature.setInsideZone(ZoneId.CLANHALL, true); + creature.setInsideZone(ZoneId.CLAN_HALL, true); ClanHall clanHall = ClanHallManager.getInstance().getClanHallById(_clanHallId); @@ -112,7 +112,7 @@ public class ClanHallZone extends ZoneType if (creature instanceof PlayerInstance) { // Unset clanhall zone - creature.setInsideZone(ZoneId.CLANHALL, false); + creature.setInsideZone(ZoneId.CLAN_HALL, false); // Send a message if ((((PlayerInstance) creature).getClanId() != 0) && (ClanHallManager.getInstance().getClanHallById(_clanHallId).getOwnerId() == ((PlayerInstance) creature).getClanId())) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DerbyTrackZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DerbyTrackZone.java index a7ee6572eb..5b33ae159b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DerbyTrackZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DerbyTrackZone.java @@ -36,7 +36,7 @@ public class DerbyTrackZone extends PeaceZone { if (creature instanceof PlayerInstance) { - creature.setInsideZone(ZoneId.MONSTERTRACK, true); + creature.setInsideZone(ZoneId.MONSTER_TRACK, true); } super.onEnter(creature); } @@ -46,7 +46,7 @@ public class DerbyTrackZone extends PeaceZone { if (creature instanceof PlayerInstance) { - creature.setInsideZone(ZoneId.MONSTERTRACK, false); + creature.setInsideZone(ZoneId.MONSTER_TRACK, false); } super.onExit(creature); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index a0c357881b..734492255c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -146,7 +146,7 @@ public class EffectZone extends ZoneType if ((creature instanceof PlayerInstance) && _isShowDangerIcon) { - creature.setInsideZone(ZoneId.DANGERAREA, true); + creature.setInsideZone(ZoneId.DANGER_AREA, true); creature.sendPacket(new EtcStatusUpdate((PlayerInstance) creature)); } } @@ -156,8 +156,8 @@ public class EffectZone extends ZoneType { if ((creature instanceof PlayerInstance) && _isShowDangerIcon) { - creature.setInsideZone(ZoneId.DANGERAREA, false); - if (!creature.isInsideZone(ZoneId.DANGERAREA)) + creature.setInsideZone(ZoneId.DANGER_AREA, false); + if (!creature.isInsideZone(ZoneId.DANGER_AREA)) { creature.sendPacket(new EtcStatusUpdate((PlayerInstance) creature)); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/JailZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/JailZone.java index 2167b45c4a..24f76da67e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/JailZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/JailZone.java @@ -41,7 +41,7 @@ public class JailZone extends ZoneType if (creature instanceof PlayerInstance) { creature.setInsideZone(ZoneId.JAIL, true); - creature.setInsideZone(ZoneId.NOSUMMONFRIEND, true); + creature.setInsideZone(ZoneId.NO_SUMMON_FRIEND, true); if (Config.JAIL_IS_PVP) { creature.setInsideZone(ZoneId.PVP, true); @@ -60,7 +60,7 @@ public class JailZone extends ZoneType if (creature instanceof PlayerInstance) { creature.setInsideZone(ZoneId.JAIL, false); - creature.setInsideZone(ZoneId.NOSUMMONFRIEND, false); + creature.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false); if (Config.JAIL_IS_PVP) { creature.setInsideZone(ZoneId.PVP, false); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoHqZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoHqZone.java index 826481b006..c5a2bb91ba 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoHqZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoHqZone.java @@ -37,7 +37,7 @@ public class NoHqZone extends ZoneType { if (creature instanceof PlayerInstance) { - creature.setInsideZone(ZoneId.NOHQ, true); + creature.setInsideZone(ZoneId.NO_HQ, true); } } @@ -46,7 +46,7 @@ public class NoHqZone extends ZoneType { if (creature instanceof PlayerInstance) { - creature.setInsideZone(ZoneId.NOHQ, false); + creature.setInsideZone(ZoneId.NO_HQ, false); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoLandingZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoLandingZone.java index ec0d025e65..d8765b0622 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoLandingZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoLandingZone.java @@ -37,7 +37,7 @@ public class NoLandingZone extends ZoneType { if (creature instanceof PlayerInstance) { - creature.setInsideZone(ZoneId.NOLANDING, true); + creature.setInsideZone(ZoneId.NO_LANDING, true); } } @@ -46,7 +46,7 @@ public class NoLandingZone extends ZoneType { if (creature instanceof PlayerInstance) { - creature.setInsideZone(ZoneId.NOLANDING, false); + creature.setInsideZone(ZoneId.NO_LANDING, false); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoStoreZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoStoreZone.java index 71b9ca792d..082f75a801 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoStoreZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/NoStoreZone.java @@ -37,7 +37,7 @@ public class NoStoreZone extends ZoneType { if (creature instanceof PlayerInstance) { - creature.setInsideZone(ZoneId.NOSTORE, true); + creature.setInsideZone(ZoneId.NO_STORE, true); } } @@ -46,7 +46,7 @@ public class NoStoreZone extends ZoneType { if (creature instanceof PlayerInstance) { - creature.setInsideZone(ZoneId.NOSTORE, false); + creature.setInsideZone(ZoneId.NO_STORE, false); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java index a563b41518..6698b4d545 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopListSet.java @@ -74,7 +74,7 @@ public class RequestRecipeShopListSet extends GameClientPacket return; } - if (player.isInsideZone(ZoneId.NOSTORE)) + if (player.isInsideZone(ZoneId.NO_STORE)) { // player.sendPacket(new RecipeShopManageList(player, player.isDwarven())); player.sendMessage("Private manufacture are disable here. Try in another place."); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java index ed8c7014b8..0fc770ded0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListBuy.java @@ -96,7 +96,7 @@ public class SetPrivateStoreListBuy extends GameClientPacket return; } - if (player.isInsideZone(ZoneId.NOSTORE)) + if (player.isInsideZone(ZoneId.NO_STORE)) { player.sendPacket(new PrivateStoreManageListBuy(player)); player.sendMessage("Trade are disable here. Try in another place."); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java index 4595559b79..3b35b25148 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java @@ -96,7 +96,7 @@ public class SetPrivateStoreListSell extends GameClientPacket return; } - if (player.isInsideZone(ZoneId.NOSTORE)) + if (player.isInsideZone(ZoneId.NO_STORE)) { player.sendPacket(new PrivateStoreManageListSell(player)); player.sendMessage("Trade are disable here. Try in another place."); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index fb06e3f677..2290e07062 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -55,7 +55,7 @@ public class EtcStatusUpdate extends GameServerPacket writeD(_player.getWeightPenalty()); // 1-4 weight penalty, lvl (1=50%, 2=66.6%, 3=80%, 4=100%) writeD(_player.isInRefusalMode() || _player.isChatBanned() ? 1 : 0); // 1 = block all chat // writeD(0x00); // 1 = danger area - writeD(_player.isInsideZone(ZoneId.DANGERAREA)/* || _player.isInDangerArea() */ ? 1 : 0); // 1 = danger area + writeD(_player.isInsideZone(ZoneId.DANGER_AREA)/* || _player.isInDangerArea() */ ? 1 : 0); // 1 = danger area writeD(Math.min(_player.getExpertisePenalty() + _player.getMasteryPenalty() + _player.getMasteryWeapPenalty(), 1)); // 1 = grade penalty writeD(_player.getCharmOfCourage() ? 1 : 0); // 1 = charm of courage (no xp loss in siege..) writeD(_player.getDeathPenaltyBuffLevel()); // 1-15 death penalty, lvl (combat ability decreased due to death) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java index c0bdbe101b..bbfa2a472a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/skills/Formulas.java @@ -1029,7 +1029,7 @@ public class Formulas } } - if (player.isInsideZone(ZoneId.CLANHALL) && (player.getClan() != null)) + if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null)) { final int clanHallIndex = player.getClan().getHasHideout(); if (clanHallIndex > 0) @@ -1108,7 +1108,7 @@ public class Formulas mpRegenBonus += 1; } - if (player.isInsideZone(ZoneId.CLANHALL) && (player.getClan() != null)) + if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null)) { final int clanHallIndex = player.getClan().getHasHideout(); if (clanHallIndex > 0)