All pastes #40121 Raw Edit

fix for res in seige

public java v1 · immutable
#40121 ·published 2006-02-05 12:25 UTC
rendered paste body
Index: D:/Source/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfResurrection.java===================================================================--- D:/Source/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfResurrection.java	(revision 2239)+++ D:/Source/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/handler/itemhandlers/ScrollOfResurrection.java	(working copy)@@ -29,6 +29,8 @@ import net.sf.l2j.gameserver.serverpackets.MagicSkillUser; import net.sf.l2j.gameserver.serverpackets.SetupGauge; import net.sf.l2j.gameserver.serverpackets.SystemMessage;+import net.sf.l2j.gameserver.instancemanager.CastleManager;+import net.sf.l2j.gameserver.model.entity.Castle;  /**   * This class ... @@ -68,7 +70,13 @@             if(targetPlayer != null || targetPet != null)             {                 boolean condGood = true;-                +                //check target is not in a active siege zone+            	Castle castle = CastleManager.getInstance().getCastle(targetPlayer.getX(),targetPlayer.getY()); +            	if (castle.getSiege().getIsInProgress())+                {+                        condGood = false;+                        activeChar.sendMessage("You Cannot Resurect in a Sieged Zone");+                }                 if (targetPet != null)                 {                     if (targetPet.getOwner() != activeChar)Index: D:/Source/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/L2Skill.java===================================================================--- D:/Source/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/L2Skill.java (revision 2239)+++ D:/Source/trunk/L2_Gameserver/java/net/sf/l2j/gameserver/model/L2Skill.java (working copy)@@ -43,7 +43,8 @@ import net.sf.l2j.gameserver.templates.L2WeaponType; import net.sf.l2j.gameserver.templates.StatsSet; import net.sf.l2j.gameserver.util.Util;-+import net.sf.l2j.gameserver.instancemanager.CastleManager;+import net.sf.l2j.gameserver.model.entity.Castle; /**  * This class ...  * @@ -1184,7 +1185,14 @@                             getId() == 1016     // Greater Resurrection                         )                     {-                        // Can only res party memeber or own pet+                       // check target is not in a active siege zone+                       Castle castle = CastleManager.getInstance().getCastle(targetPlayer.getX(),targetPlayer.getY()); +                       if (castle.getSiege().getIsInProgress())+                        {+                                condGood = false;+                                player.sendMessage("You Cannot Resurect in a Sieged Zone");+                        }+                       // Can only res party memeber or own pet                         if (targetPet != null)                         {                             if (targetPet.getOwner() != player)