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

Fixed battlegrounds resurrection.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDev 2018-07-01 00:32:08 +00:00
parent 581cae366f
commit 79c00f9c03
8 changed files with 379 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
View File

@ -16,9 +16,12 @@
*/
package com.l2jmobius.gameserver.model.conditions;
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Siege;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -45,6 +48,10 @@ public class ConditionPlayerCanResurrect extends Condition
{
return true;
}
if (effected == null)
{
return false;
}
boolean canResurrect = true;
if (effected.isPlayer())
@ -76,6 +83,46 @@ public class ConditionPlayerCanResurrect extends Condition
effector.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED);
}
}
else if (skill.getId() != 2393) // Blessed Scroll of Battlefield Resurrection
{
final Siege siege = SiegeManager.getInstance().getSiege(player);
if ((siege != null) && siege.isInProgress())
{
final L2Clan clan = player.getClan();
if (clan == null)
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
else if (siege.checkIsDefender(clan) && (siege.getControlTowerCount() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.THE_GUARDIAN_TOWER_HAS_BEEN_DESTROYED_AND_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else if (siege.checkIsAttacker(clan) && (siege.getAttackerClan(clan).getNumFlags() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IF_A_BASE_CAMP_DOES_NOT_EXIST_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
}
}
}
else if (effected.isSummon())
{
@ -108,6 +155,6 @@ public class ConditionPlayerCanResurrect extends Condition
}
}
}
return (_val == canResurrect);
return _val == canResurrect;
}
}

49
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
View File

@ -16,9 +16,12 @@
*/
package com.l2jmobius.gameserver.model.conditions;
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Siege;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -45,6 +48,10 @@ public class ConditionPlayerCanResurrect extends Condition
{
return true;
}
if (effected == null)
{
return false;
}
boolean canResurrect = true;
if (effected.isPlayer())
@ -76,6 +83,46 @@ public class ConditionPlayerCanResurrect extends Condition
effector.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED);
}
}
else if (skill.getId() != 2393) // Blessed Scroll of Battlefield Resurrection
{
final Siege siege = SiegeManager.getInstance().getSiege(player);
if ((siege != null) && siege.isInProgress())
{
final L2Clan clan = player.getClan();
if (clan == null)
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
else if (siege.checkIsDefender(clan) && (siege.getControlTowerCount() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.THE_GUARDIAN_TOWER_HAS_BEEN_DESTROYED_AND_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else if (siege.checkIsAttacker(clan) && (siege.getAttackerClan(clan).getNumFlags() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IF_A_BASE_CAMP_DOES_NOT_EXIST_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
}
}
}
else if (effected.isSummon())
{
@ -108,6 +155,6 @@ public class ConditionPlayerCanResurrect extends Condition
}
}
}
return (_val == canResurrect);
return _val == canResurrect;
}
}

49
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
View File

@ -16,9 +16,12 @@
*/
package com.l2jmobius.gameserver.model.conditions;
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Siege;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -45,6 +48,10 @@ public class ConditionPlayerCanResurrect extends Condition
{
return true;
}
if (effected == null)
{
return false;
}
boolean canResurrect = true;
if (effected.isPlayer())
@ -76,6 +83,46 @@ public class ConditionPlayerCanResurrect extends Condition
effector.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED);
}
}
else if (skill.getId() != 2393) // Blessed Scroll of Battlefield Resurrection
{
final Siege siege = SiegeManager.getInstance().getSiege(player);
if ((siege != null) && siege.isInProgress())
{
final L2Clan clan = player.getClan();
if (clan == null)
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
else if (siege.checkIsDefender(clan) && (siege.getControlTowerCount() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.THE_GUARDIAN_TOWER_HAS_BEEN_DESTROYED_AND_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else if (siege.checkIsAttacker(clan) && (siege.getAttackerClan(clan).getNumFlags() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IF_A_BASE_CAMP_DOES_NOT_EXIST_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
}
}
}
else if (effected.isSummon())
{
@ -108,6 +155,6 @@ public class ConditionPlayerCanResurrect extends Condition
}
}
}
return (_val == canResurrect);
return _val == canResurrect;
}
}

49
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
View File

@ -16,9 +16,12 @@
*/
package com.l2jmobius.gameserver.model.conditions;
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Siege;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -45,6 +48,10 @@ public class ConditionPlayerCanResurrect extends Condition
{
return true;
}
if (effected == null)
{
return false;
}
boolean canResurrect = true;
if (effected.isPlayer())
@ -76,6 +83,46 @@ public class ConditionPlayerCanResurrect extends Condition
effector.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED);
}
}
else if (skill.getId() != 2393) // Blessed Scroll of Battlefield Resurrection
{
final Siege siege = SiegeManager.getInstance().getSiege(player);
if ((siege != null) && siege.isInProgress())
{
final L2Clan clan = player.getClan();
if (clan == null)
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
else if (siege.checkIsDefender(clan) && (siege.getControlTowerCount() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.THE_GUARDIAN_TOWER_HAS_BEEN_DESTROYED_AND_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else if (siege.checkIsAttacker(clan) && (siege.getAttackerClan(clan).getNumFlags() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IF_A_BASE_CAMP_DOES_NOT_EXIST_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
}
}
}
else if (effected.isSummon())
{
@ -108,6 +155,6 @@ public class ConditionPlayerCanResurrect extends Condition
}
}
}
return (_val == canResurrect);
return _val == canResurrect;
}
}

43
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
View File

@ -16,9 +16,12 @@
*/
package com.l2jmobius.gameserver.model.conditions;
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Siege;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -80,6 +83,46 @@ public class ConditionPlayerCanResurrect extends Condition
effector.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED);
}
}
else if (skill.getId() != 2393) // Blessed Scroll of Battlefield Resurrection
{
final Siege siege = SiegeManager.getInstance().getSiege(player);
if ((siege != null) && siege.isInProgress())
{
final L2Clan clan = player.getClan();
if (clan == null)
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEFIELDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
else if (siege.checkIsDefender(clan) && (siege.getControlTowerCount() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.THE_GUARDIAN_TOWER_HAS_BEEN_DESTROYED_AND_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else if (siege.checkIsAttacker(clan) && (siege.getAttackerClan(clan).getNumFlags() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IF_A_BASE_CAMP_DOES_NOT_EXIST_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEFIELDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
}
}
}
else if (effected.isSummon())
{

49
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
View File

@ -16,9 +16,12 @@
*/
package com.l2jmobius.gameserver.model.conditions;
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Siege;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -45,6 +48,10 @@ public class ConditionPlayerCanResurrect extends Condition
{
return true;
}
if (effected == null)
{
return false;
}
boolean canResurrect = true;
if (effected.isPlayer())
@ -76,6 +83,46 @@ public class ConditionPlayerCanResurrect extends Condition
effector.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED);
}
}
else if (skill.getId() != 2393) // Blessed Scroll of Battlefield Resurrection
{
final Siege siege = SiegeManager.getInstance().getSiege(player);
if ((siege != null) && siege.isInProgress())
{
final L2Clan clan = player.getClan();
if (clan == null)
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
else if (siege.checkIsDefender(clan) && (siege.getControlTowerCount() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.THE_GUARDIAN_TOWER_HAS_BEEN_DESTROYED_AND_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else if (siege.checkIsAttacker(clan) && (siege.getAttackerClan(clan).getNumFlags() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IF_A_BASE_CAMP_DOES_NOT_EXIST_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
}
}
}
else if (effected.isSummon())
{
@ -108,6 +155,6 @@ public class ConditionPlayerCanResurrect extends Condition
}
}
}
return (_val == canResurrect);
return _val == canResurrect;
}
}

49
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
View File

@ -16,9 +16,12 @@
*/
package com.l2jmobius.gameserver.model.conditions;
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Siege;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -45,6 +48,10 @@ public class ConditionPlayerCanResurrect extends Condition
{
return true;
}
if (effected == null)
{
return false;
}
boolean canResurrect = true;
if (effected.isPlayer())
@ -76,6 +83,46 @@ public class ConditionPlayerCanResurrect extends Condition
effector.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED);
}
}
else if (skill.getId() != 2393) // Blessed Scroll of Battlefield Resurrection
{
final Siege siege = SiegeManager.getInstance().getSiege(player);
if ((siege != null) && siege.isInProgress())
{
final L2Clan clan = player.getClan();
if (clan == null)
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
else if (siege.checkIsDefender(clan) && (siege.getControlTowerCount() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.THE_GUARDIAN_TOWER_HAS_BEEN_DESTROYED_AND_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else if (siege.checkIsAttacker(clan) && (siege.getAttackerClan(clan).getNumFlags() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IF_A_BASE_CAMP_DOES_NOT_EXIST_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
}
}
}
else if (effected.isSummon())
{
@ -108,6 +155,6 @@ public class ConditionPlayerCanResurrect extends Condition
}
}
}
return (_val == canResurrect);
return _val == canResurrect;
}
}

49
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
View File

@ -16,9 +16,12 @@
*/
package com.l2jmobius.gameserver.model.conditions;
import com.l2jmobius.gameserver.instancemanager.SiegeManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Siege;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
@ -45,6 +48,10 @@ public class ConditionPlayerCanResurrect extends Condition
{
return true;
}
if (effected == null)
{
return false;
}
boolean canResurrect = true;
if (effected.isPlayer())
@ -76,6 +83,46 @@ public class ConditionPlayerCanResurrect extends Condition
effector.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED);
}
}
else if (skill.getId() != 2393) // Blessed Scroll of Battlefield Resurrection
{
final Siege siege = SiegeManager.getInstance().getSiege(player);
if ((siege != null) && siege.isInProgress())
{
final L2Clan clan = player.getClan();
if (clan == null)
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
else if (siege.checkIsDefender(clan) && (siege.getControlTowerCount() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.THE_GUARDIAN_TOWER_HAS_BEEN_DESTROYED_AND_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else if (siege.checkIsAttacker(clan) && (siege.getAttackerClan(clan).getNumFlags() == 0))
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IF_A_BASE_CAMP_DOES_NOT_EXIST_RESURRECTION_IS_NOT_POSSIBLE);
}
}
else
{
canResurrect = false;
if (effector.isPlayer())
{
effector.sendPacket(SystemMessageId.IT_IS_NOT_POSSIBLE_TO_RESURRECT_IN_BATTLEGROUNDS_WHERE_A_SIEGE_WAR_IS_TAKING_PLACE);
}
}
}
}
}
else if (effected.isSummon())
{
@ -108,6 +155,6 @@ public class ConditionPlayerCanResurrect extends Condition
}
}
}
return (_val == canResurrect);
return _val == canResurrect;
}
}