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

Disabled spawn protection messages in peace zones.

Browse Source
This commit is contained in:
MobiusDev
2018-04-02 18:24:38 +00:00
parent 8c72575f76
commit ca8ac1fb29
8 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+8 -2
View File
@@ -10266,7 +10266,10 @@ public final class L2PcInstance extends L2Playable
if (isSpawnProtected())
{
setProtection(false);
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
if (!isInsideZone(ZoneId.PEACE))
{
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
}
if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
{
CharSummonTable.getInstance().restoreServitor(this);
@@ -10279,7 +10282,10 @@ public final class L2PcInstance extends L2Playable
if (isTeleportProtected())
{
setTeleportProtection(false);
sendMessage("Teleport spawn protection ended.");
if (!isInsideZone(ZoneId.PEACE))
{
sendMessage("Teleport spawn protection ended.");
}
}
}
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+8 -2
View File
@@ -10273,7 +10273,10 @@ public final class L2PcInstance extends L2Playable
if (isSpawnProtected())
{
setProtection(false);
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
if (!isInsideZone(ZoneId.PEACE))
{
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
}
if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
{
CharSummonTable.getInstance().restoreServitor(this);
@@ -10286,7 +10289,10 @@ public final class L2PcInstance extends L2Playable
if (isTeleportProtected())
{
setTeleportProtection(false);
sendMessage("Teleport spawn protection ended.");
if (!isInsideZone(ZoneId.PEACE))
{
sendMessage("Teleport spawn protection ended.");
}
}
}
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+8 -2
View File
@@ -10283,7 +10283,10 @@ public final class L2PcInstance extends L2Playable
if (isSpawnProtected())
{
setProtection(false);
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
if (!isInsideZone(ZoneId.PEACE))
{
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
}
if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
{
CharSummonTable.getInstance().restoreServitor(this);
@@ -10296,7 +10299,10 @@ public final class L2PcInstance extends L2Playable
if (isTeleportProtected())
{
setTeleportProtection(false);
sendMessage("Teleport spawn protection ended.");
if (!isInsideZone(ZoneId.PEACE))
{
sendMessage("Teleport spawn protection ended.");
}
}
}
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+8 -2
View File
@@ -10276,7 +10276,10 @@ public final class L2PcInstance extends L2Playable
if (isSpawnProtected())
{
setProtection(false);
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
if (!isInsideZone(ZoneId.PEACE))
{
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
}
if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
{
CharSummonTable.getInstance().restoreServitor(this);
@@ -10289,7 +10292,10 @@ public final class L2PcInstance extends L2Playable
if (isTeleportProtected())
{
setTeleportProtection(false);
sendMessage("Teleport spawn protection ended.");
if (!isInsideZone(ZoneId.PEACE))
{
sendMessage("Teleport spawn protection ended.");
}
}
}
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+9 -15
View File
@@ -15293,27 +15293,21 @@ public final class L2PcInstance extends L2Playable
*/
public void onActionRequest()
{
/*
* Important: dont send here a broadcast like removeAbnornalstatus cause they will create mass lag on pvp
*/
if (isSpawnProtected())
{
sendMessage("The effect of Spawn Protection has been removed.");
}
else if (isTeleportProtected())
{
sendMessage("The effect of Teleport Spawn Protection has been removed.");
}
if (Config.PLAYER_SPAWN_PROTECTION > 0)
{
setProtection(false);
if (!isInsideZone(ZoneId.PEACE))
{
sendMessage("You are no longer protected from aggressive monsters.");
}
}
if (Config.PLAYER_TELEPORT_PROTECTION > 0)
if (isTeleportProtected())
{
setTeleportProtection(false);
if (!isInsideZone(ZoneId.PEACE))
{
sendMessage("Teleport spawn protection ended.");
}
}
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+10 -5
View File
@@ -10606,8 +10606,11 @@ public final class L2PcInstance extends L2Playable
{
if (isSpawnProtected())
{
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
setProtection(false);
if (!isInsideZone(ZoneId.PEACE))
{
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
}
if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
{
CharSummonTable.getInstance().restoreServitor(this);
@@ -10619,10 +10622,12 @@ public final class L2PcInstance extends L2Playable
}
if (isTeleportProtected())
{
sendMessage("Teleport spawn protection ended.");
setTeleportProtection(false);
if (!isInsideZone(ZoneId.PEACE))
{
sendMessage("Teleport spawn protection ended.");
}
}
setProtection(false);
setTeleportProtection(false);
}
/**
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+8 -2
View File
@@ -10211,7 +10211,10 @@ public final class L2PcInstance extends L2Playable
if (isSpawnProtected())
{
setProtection(false);
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
if (!isInsideZone(ZoneId.PEACE))
{
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
}
if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
{
CharSummonTable.getInstance().restoreServitor(this);
@@ -10224,7 +10227,10 @@ public final class L2PcInstance extends L2Playable
if (isTeleportProtected())
{
setTeleportProtection(false);
sendMessage("Teleport spawn protection ended.");
if (!isInsideZone(ZoneId.PEACE))
{
sendMessage("Teleport spawn protection ended.");
}
}
}
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+8 -2
View File
@@ -10211,7 +10211,10 @@ public final class L2PcInstance extends L2Playable
if (isSpawnProtected())
{
setProtection(false);
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
if (!isInsideZone(ZoneId.PEACE))
{
sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
}
if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
{
CharSummonTable.getInstance().restoreServitor(this);
@@ -10224,7 +10227,10 @@ public final class L2PcInstance extends L2Playable
if (isTeleportProtected())
{
setTeleportProtection(false);
sendMessage("Teleport spawn protection ended.");
if (!isInsideZone(ZoneId.PEACE))
{
sendMessage("Teleport spawn protection ended.");
}
}
}