Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java (modified) (5 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java

@@ -18 +18 @@
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Object.InstanceType;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27 +26 @@
 public class L2DoorInstanceActionShift implements IActionHandler
 {
+        @Override
         public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
         {
@@ -35 +35 @@
                         
                         StaticObject su;
+                        L2DoorInstance door = (L2DoorInstance)target;
                         // send HP amount if doors are inside castle/fortress zone
-                        // TODO: needed to be added here doors from conquerable clanhalls
-                        if ((((L2DoorInstance)target).getCastle() != null
-                                        && ((L2DoorInstance)target).getCastle().getCastleId() > 0)
-                                        || (((L2DoorInstance)target).getFort() != null
-                                                        && ((L2DoorInstance)target).getFort().getFortId() > 0
-                                                        && !((L2DoorInstance)target).getIsCommanderDoor()))
-                                su = new StaticObject((L2DoorInstance)target, true);
+
+                        if ((door.getCastle() != null && door.getCastle().getCastleId() > 0)
+                                || (door.getFort() != null && door.getFort().getFortId() > 0
+                                || (door.getClanHall() != null && door.getClanHall().isSiegableHall())
+                                && !door.getIsCommanderDoor()))
+                        {
+                                su = new StaticObject(door, true);
+                        }
                         else
-                                su  = new StaticObject((L2DoorInstance)target, false);
+                        {
+                                su  = new StaticObject(door, false);
+                        }
                         
                         activeChar.sendPacket(su);
@@ -51 +55 @@
                         html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/doorinfo.htm");
                         html.replace("%class%", target.getClass().getSimpleName());
-                        html.replace("%hp%",    String.valueOf((int)((L2Character)target).getCurrentHp()));
-                        html.replace("%hpmax%", String.valueOf(((L2Character)target).getMaxHp()));
+                        html.replace("%hp%",    String.valueOf((int)door.getCurrentHp()));
+                        html.replace("%hpmax%", String.valueOf(door.getMaxHp()));
                         html.replace("%objid%", String.valueOf(target.getObjectId()));
-                        html.replace("%doorid%",  String.valueOf(((L2DoorInstance)target).getDoorId()));
+                        html.replace("%doorid%",  String.valueOf(door.getDoorId()));
                         
-                        html.replace("%minx%", String.valueOf(((L2DoorInstance)target).getXMin()));
-                        html.replace("%miny%", String.valueOf(((L2DoorInstance)target).getYMin()));
-                        html.replace("%minz%", String.valueOf(((L2DoorInstance)target).getZMin()));
+                        html.replace("%minx%", String.valueOf(door.getXMin()));
+                        html.replace("%miny%", String.valueOf(door.getYMin()));
+                        html.replace("%minz%", String.valueOf(door.getZMin()));
                         
-                        html.replace("%maxx%", String.valueOf(((L2DoorInstance)target).getXMax()));
-                        html.replace("%maxy%", String.valueOf(((L2DoorInstance)target).getYMax()));
-                        html.replace("%maxz%", String.valueOf(((L2DoorInstance)target).getZMax()));
-                        html.replace("%unlock%", ((L2DoorInstance)target).isUnlockable() ? "<font color=00FF00>YES<font>" : "<font color=FF0000>NO</font>");
+                        html.replace("%maxx%", String.valueOf(door.getXMax()));
+                        html.replace("%maxy%", String.valueOf(door.getYMax()));
+                        html.replace("%maxz%", String.valueOf(door.getZMax()));
+                        html.replace("%unlock%", door.isUnlockable() ? "<font color=00FF00>YES<font>" : "<font color=FF0000>NO</font>");
                         
                         activeChar.sendPacket(html);
@@ -70 +74 @@
         }
         
+        @Override
         public InstanceType getInstanceType()
         {