Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.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/L2StaticObjectInstanceAction.java (modified) (3 diffs)

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

@@ -28 +28 @@
 public class L2StaticObjectInstanceAction implements IActionHandler
 {
-        public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
+        @Override
+        public boolean action(final L2PcInstance activeChar, final L2Object target, final boolean interact)
         {
-                if (((L2StaticObjectInstance) target).getType() < 0)
+                final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target;
+                if (staticObject.getType() < 0)
                 {
-                        _log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + ((L2StaticObjectInstance) target).getStaticObjectId());
+                        _log.info("L2StaticObjectInstance: StaticObject with invalid type! StaticObjectId: " + staticObject.getStaticObjectId());
                 }
                 
                 // Check if the L2PcInstance already target the L2NpcInstance
-                if (activeChar.getTarget() != target)
+                if (activeChar.getTarget() != staticObject)
                 {
                         // Set the target of the L2PcInstance activeChar
-                        activeChar.setTarget(target);
-                        activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), 0));
+                        activeChar.setTarget(staticObject);
+                        activeChar.sendPacket(new MyTargetSelected(staticObject.getObjectId(), 0));
                 }
                 else if (interact)
                 {
-                        activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), 0));
+                        activeChar.sendPacket(new MyTargetSelected(staticObject.getObjectId(), 0));
                         
                         // Calculate the distance between the L2PcInstance and the L2NpcInstance
-                        if (!activeChar.isInsideRadius(target, L2Npc.INTERACTION_DISTANCE, false, false))
+                        if (!activeChar.isInsideRadius(staticObject, L2Npc.INTERACTION_DISTANCE, false, false))
                         {
                                 // Notify the L2PcInstance AI with AI_INTENTION_INTERACT
-                                activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, target);
+                                activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, staticObject);
                         }
                         else
                         {
-                                if ((((L2StaticObjectInstance) target).getType() == 2) && (((L2StaticObjectInstance) target).getStaticObjectId() == 24230101))
+                                if (staticObject.getType() == 2)
                                 {
-                                        String filename = "data/html/signboards/tomb_of_crystalgolem.htm";
-                                        String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename);
-                                        NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());
+                                        final String filename = (staticObject.getStaticObjectId() == 24230101) ? "data/html/signboards/pvp_signboard.htm" : "data/html/signboards/tomb_of_crystalgolem.htm";
+                                        final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename);
+                                        final NpcHtmlMessage html = new NpcHtmlMessage(staticObject.getObjectId());
                                         
                                         if (content == null)
@@ -71 +73 @@
                                         activeChar.sendPacket(html);
                                 }
-                                else if ((((L2StaticObjectInstance) target).getType() == 2) && (((L2StaticObjectInstance) target).getStaticObjectId() != 24230101))
+                                else if (staticObject.getType() == 0)
                                 {
-                                        String filename = "data/html/signboards/pvp_signboard.htm";
-                                        String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename);
-                                        NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());
-                                        
-                                        if (content == null)
-                                        {
-                                                html.setHtml("<html><body>Signboard is missing:<br>" + filename + "</body></html>");
-                                        }
-                                        else
-                                        {
-                                                html.setHtml(content);
-                                        }
-                                        
-                                        activeChar.sendPacket(html);
-                                }
-                                else if (((L2StaticObjectInstance) target).getType() == 0)
-                                {
-                                        activeChar.sendPacket(((L2StaticObjectInstance) target).getMap());
+                                        activeChar.sendPacket(staticObject.getMap());
                                 }
                         }
@@ -97 +82 @@
         }
         
+        @Override
         public InstanceType getInstanceType()
         {