Forráskód Böngészése

BETA: DP-Part for [L5983]

Rumen Nikiforov 12 éve
szülő
commit
3089c4fb5c
16 módosított fájl, 4 hozzáadás és 181 törlés
  1. 0 7
      L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
  2. 0 12
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java
  3. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java
  4. 0 9
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java
  5. 1 5
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java
  6. 0 21
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java
  7. 0 32
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java
  8. 0 14
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java
  9. 0 12
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceActionShift.java
  10. 0 17
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java
  11. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java
  12. 2 7
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java
  13. 0 19
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java
  14. 1 10
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonActionShift.java
  15. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java
  16. 0 5
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java

+ 0 - 7
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java

@@ -39,8 +39,6 @@ import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -299,11 +297,6 @@ public class BeastFarm extends AbstractNpcAI
 			nextNpc.addDamageHate(player, 0, 99999);
 			nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
 			
-			player.sendPacket(new MyTargetSelected(nextNpc.getObjectId(), player.getLevel() - nextNpc.getLevel()));
-			StatusUpdate su = new StatusUpdate(nextNpc);
-			su.addAttribute(StatusUpdate.CUR_HP, (int) nextNpc.getCurrentHp());
-			su.addAttribute(StatusUpdate.MAX_HP, nextNpc.getMaxHp());
-			player.sendPacket(su);
 			player.setTarget(nextNpc);
 		}
 	}

+ 0 - 12
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java

@@ -22,11 +22,8 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.handler.IActionHandler;
 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.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 public class L2ArtefactInstanceAction implements IActionHandler
 {
@@ -50,18 +47,9 @@ public class L2ArtefactInstanceAction implements IActionHandler
 		{
 			return false;
 		}
-		
 		if (activeChar.getTarget() != target)
 		{
-			// Set the target of the L2PcInstance activeChar
 			activeChar.setTarget(target);
-			
-			// Send a Server->Client packet MyTargetSelected to the L2PcInstance activeChar
-			MyTargetSelected my = new MyTargetSelected(target.getObjectId(), 0);
-			activeChar.sendPacket(my);
-			
-			// Send a Server->Client packet ValidateLocation to correct the L2ArtefactInstance position and heading on the client
-			activeChar.sendPacket(new ValidateLocation((L2Character) target));
 		}
 		else if (interact)
 		{

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DecoyAction.java

@@ -21,10 +21,8 @@ package handlers.actionhandlers;
 import com.l2jserver.gameserver.handler.IActionHandler;
 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.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 
 public class L2DecoyAction implements IActionHandler
 {
@@ -39,7 +37,6 @@ public class L2DecoyAction implements IActionHandler
 		}
 		
 		activeChar.setTarget(target);
-		activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), activeChar.getLevel() - ((L2Character) target).getLevel()));
 		return true;
 	}
 	

+ 0 - 9
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceAction.java

@@ -29,8 +29,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.model.holders.DoorRequestHolder;
 import com.l2jserver.gameserver.network.serverpackets.ConfirmDlg;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.network.serverpackets.StaticObject;
 
 public class L2DoorInstanceAction implements IActionHandler
 {
@@ -40,14 +38,7 @@ public class L2DoorInstanceAction implements IActionHandler
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (activeChar.getTarget() != target)
 		{
-			// Set the target of the L2PcInstance activeChar
 			activeChar.setTarget(target);
-			
-			// Send a Server->Client packet MyTargetSelected to the L2PcInstance activeChar
-			activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), 0));
-			
-			StaticObject su = new StaticObject((L2DoorInstance) target, activeChar.isGM());
-			activeChar.sendPacket(su);
 		}
 		else if (interact)
 		{

+ 1 - 5
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2DoorInstanceActionShift.java

@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.StaticObject;
 
@@ -35,11 +34,8 @@ public class L2DoorInstanceActionShift implements IActionHandler
 		if (activeChar.getAccessLevel().isGm())
 		{
 			activeChar.setTarget(target);
-			activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), activeChar.getLevel()));
-			
 			L2DoorInstance door = (L2DoorInstance) target;
-			StaticObject su = new StaticObject(door, activeChar.isGM());
-			activeChar.sendPacket(su);
+			activeChar.sendPacket(new StaticObject(door, activeChar.isGM()));
 			
 			NpcHtmlMessage html = new NpcHtmlMessage(0);
 			html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/doorinfo.htm");

+ 0 - 21
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java

@@ -32,9 +32,6 @@ import com.l2jserver.gameserver.model.entity.L2Event;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.Quest.QuestEventType;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 import com.l2jserver.util.Rnd;
 
 public class L2NpcAction implements IActionHandler
@@ -77,28 +74,10 @@ public class L2NpcAction implements IActionHandler
 			if (target.isAutoAttackable(activeChar))
 			{
 				((L2Npc) target).getAI(); // wake up ai
-				// Send a Server->Client packet MyTargetSelected to the L2PcInstance activeChar
-				// The activeChar.getLevel() - getLevel() permit to display the correct color in the select window
-				MyTargetSelected my = new MyTargetSelected(target.getObjectId(), activeChar.getLevel() - ((L2Character) target).getLevel());
-				activeChar.sendPacket(my);
-				// Send a Server->Client packet StatusUpdate of the L2Npc to the L2PcInstance to update its HP bar
-				StatusUpdate su = new StatusUpdate(target);
-				su.addAttribute(StatusUpdate.CUR_HP, (int) ((L2Character) target).getCurrentHp());
-				su.addAttribute(StatusUpdate.MAX_HP, ((L2Character) target).getMaxHp());
-				activeChar.sendPacket(su);
 			}
-			else
-			{
-				// Send a Server->Client packet MyTargetSelected to the L2PcInstance activeChar
-				MyTargetSelected my = new MyTargetSelected(target.getObjectId(), 0);
-				activeChar.sendPacket(my);
-			}
-			// Send a Server->Client packet ValidateLocation to correct the L2Npc position and heading on the client
-			activeChar.sendPacket(new ValidateLocation((L2Character) target));
 		}
 		else if (interact)
 		{
-			activeChar.sendPacket(new ValidateLocation((L2Character) target));
 			// Check if the activeChar is attackable (without a forced attack) and isn't dead
 			if (target.isAutoAttackable(activeChar) && !((L2Character) target).isAlikeDead())
 			{

+ 0 - 32
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2NpcActionShift.java

@@ -35,9 +35,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.stats.BaseStats;
 import com.l2jserver.gameserver.model.stats.Stats;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.util.StringUtil;
 
 public class L2NpcActionShift implements IActionHandler
@@ -66,21 +64,6 @@ public class L2NpcActionShift implements IActionHandler
 			// Set the target of the L2PcInstance activeChar
 			activeChar.setTarget(target);
 			
-			// Send a Server->Client packet MyTargetSelected to the L2PcInstance activeChar
-			// The activeChar.getLevel() - getLevel() permit to display the correct color in the select window
-			MyTargetSelected my = new MyTargetSelected(target.getObjectId(), activeChar.getLevel() - ((L2Character) target).getLevel());
-			activeChar.sendPacket(my);
-			
-			// Check if the activeChar is attackable (without a forced attack)
-			if (target.isAutoAttackable(activeChar))
-			{
-				// Send a Server->Client packet StatusUpdate of the L2NpcInstance to the L2PcInstance to update its HP bar
-				StatusUpdate su = new StatusUpdate(target);
-				su.addAttribute(StatusUpdate.CUR_HP, (int) ((L2Character) target).getCurrentHp());
-				su.addAttribute(StatusUpdate.MAX_HP, ((L2Character) target).getMaxHp());
-				activeChar.sendPacket(su);
-			}
-			
 			NpcHtmlMessage html = new NpcHtmlMessage(0);
 			html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/npcinfo.htm");
 			
@@ -197,21 +180,6 @@ public class L2NpcActionShift implements IActionHandler
 			// Set the target of the L2PcInstance activeChar
 			activeChar.setTarget(target);
 			
-			// Send a Server->Client packet MyTargetSelected to the L2PcInstance activeChar
-			// The activeChar.getLevel() - getLevel() permit to display the correct color in the select window
-			MyTargetSelected my = new MyTargetSelected(target.getObjectId(), activeChar.getLevel() - ((L2Character) target).getLevel());
-			activeChar.sendPacket(my);
-			
-			// Check if the activeChar is attackable (without a forced attack)
-			if (target.isAutoAttackable(activeChar))
-			{
-				// Send a Server->Client packet StatusUpdate of the L2NpcInstance to the L2PcInstance to update its HP bar
-				StatusUpdate su = new StatusUpdate(target);
-				su.addAttribute(StatusUpdate.CUR_HP, (int) ((L2Character) target).getCurrentHp());
-				su.addAttribute(StatusUpdate.MAX_HP, ((L2Character) target).getMaxHp());
-				activeChar.sendPacket(su);
-			}
-			
 			NpcHtmlMessage html = new NpcHtmlMessage(0);
 			int hpMul = Math.round((float) (((L2Character) target).getStat().calcStat(Stats.MAX_HP, 1, (L2Character) target, null) / BaseStats.CON.calcBonus((L2Character) target)));
 			if (hpMul == 0)

+ 0 - 14
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java

@@ -29,8 +29,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 public class L2PcInstanceAction implements IActionHandler
 {
@@ -81,21 +79,9 @@ public class L2PcInstanceAction implements IActionHandler
 		{
 			// Set the target of the activeChar
 			activeChar.setTarget(target);
-			
-			// Send a Server->Client packet MyTargetSelected to the activeChar
-			// The color to display in the select window is White
-			activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), 0));
-			if (activeChar != target)
-			{
-				activeChar.sendPacket(new ValidateLocation((L2Character) target));
-			}
 		}
 		else if (interact)
 		{
-			if (activeChar != target)
-			{
-				activeChar.sendPacket(new ValidateLocation((L2Character) target));
-			}
 			// Check if this L2PcInstance has a Private Store
 			if (((L2PcInstance) target).getPrivateStoreType() != L2PcInstance.STORE_PRIVATE_NONE)
 			{

+ 0 - 12
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceActionShift.java

@@ -23,10 +23,7 @@ import com.l2jserver.gameserver.handler.IActionHandler;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 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.L2PcInstance;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 public class L2PcInstanceActionShift implements IActionHandler
 {
@@ -40,15 +37,6 @@ public class L2PcInstanceActionShift implements IActionHandler
 			{
 				// Set the target of the L2PcInstance activeChar
 				activeChar.setTarget(target);
-				
-				// Send a Server->Client packet MyTargetSelected to the L2PcInstance activeChar
-				activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), 0));
-			}
-			
-			// Send a Server->Client packet ValidateLocation to correct the L2PcInstance position and heading on the client
-			if (activeChar != target)
-			{
-				activeChar.sendPacket(new ValidateLocation((L2Character) target));
 			}
 			
 			IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_character_info");

+ 0 - 17
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java

@@ -28,10 +28,7 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.PetStatusShow;
-import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 public class L2PetInstanceAction implements IActionHandler
 {
@@ -47,28 +44,14 @@ public class L2PetInstanceAction implements IActionHandler
 		
 		boolean isOwner = activeChar.getObjectId() == ((L2PetInstance) target).getOwner().getObjectId();
 		
-		activeChar.sendPacket(new ValidateLocation((L2Character) target));
 		if (isOwner && (activeChar != ((L2PetInstance) target).getOwner()))
 		{
 			((L2PetInstance) target).updateRefOwner(activeChar);
 		}
 		if (activeChar.getTarget() != target)
 		{
-			if (Config.DEBUG)
-			{
-				_log.fine("new target selected:" + target.getObjectId());
-			}
-			
 			// Set the target of the L2PcInstance activeChar
 			activeChar.setTarget(target);
-			
-			activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), activeChar.getLevel() - ((L2Character) target).getLevel()));
-			
-			// Send a Server->Client packet StatusUpdate of the L2PetInstance to the L2PcInstance to update its HP bar
-			StatusUpdate su = new StatusUpdate(target);
-			su.addAttribute(StatusUpdate.CUR_HP, (int) ((L2Character) target).getCurrentHp());
-			su.addAttribute(StatusUpdate.MAX_HP, ((L2Character) target).getMaxHp());
-			activeChar.sendPacket(su);
 		}
 		else if (interact)
 		{

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java

@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 
 public class L2StaticObjectInstanceAction implements IActionHandler
@@ -45,12 +44,9 @@ public class L2StaticObjectInstanceAction implements IActionHandler
 		{
 			// Set the target of the L2PcInstance activeChar
 			activeChar.setTarget(staticObject);
-			activeChar.sendPacket(new MyTargetSelected(staticObject.getObjectId(), 0));
 		}
 		else if (interact)
 		{
-			activeChar.sendPacket(new MyTargetSelected(staticObject.getObjectId(), 0));
-			
 			// Calculate the distance between the L2PcInstance and the L2NpcInstance
 			if (!activeChar.isInsideRadius(staticObject, L2Npc.INTERACTION_DISTANCE, false, false))
 			{

+ 2 - 7
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceActionShift.java

@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.StaticObject;
 import com.l2jserver.util.StringUtil;
@@ -36,14 +35,10 @@ public class L2StaticObjectInstanceActionShift implements IActionHandler
 		if (activeChar.getAccessLevel().isGm())
 		{
 			activeChar.setTarget(target);
-			activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), activeChar.getLevel()));
-			
-			StaticObject su = new StaticObject((L2StaticObjectInstance) target);
-			activeChar.sendPacket(su);
+			activeChar.sendPacket(new StaticObject((L2StaticObjectInstance) target));
 			
 			NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());
-			final String html1 = StringUtil.concat("<html><body><center><font color=\"LEVEL\">Static Object Info</font></center><br><table border=0><tr><td>Coords X,Y,Z: </td><td>", String.valueOf(target.getX()), ", ", String.valueOf(target.getY()), ", ", String.valueOf(target.getZ()), "</td></tr><tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Static Object ID: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getStaticObjectId()), "</td></tr><tr><td>Mesh Index: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getMeshIndex()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>");
-			html.setHtml(html1);
+			html.setHtml(StringUtil.concat("<html><body><center><font color=\"LEVEL\">Static Object Info</font></center><br><table border=0><tr><td>Coords X,Y,Z: </td><td>", String.valueOf(target.getX()), ", ", String.valueOf(target.getY()), ", ", String.valueOf(target.getZ()), "</td></tr><tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Static Object ID: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getStaticObjectId()), "</td></tr><tr><td>Mesh Index: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getMeshIndex()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>"));
 			activeChar.sendPacket(html);
 		}
 		return true;

+ 0 - 19
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java

@@ -24,15 +24,11 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.handler.IActionHandler;
 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.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 import com.l2jserver.gameserver.network.serverpackets.PetStatusShow;
-import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 public class L2SummonAction implements IActionHandler
 {
@@ -54,25 +50,10 @@ public class L2SummonAction implements IActionHandler
 		}
 		else if (activeChar.getTarget() != target)
 		{
-			if (Config.DEBUG)
-			{
-				_log.fine("new target selected:" + target.getObjectId());
-			}
-			
 			activeChar.setTarget(target);
-			activeChar.sendPacket(new ValidateLocation((L2Character) target));
-			MyTargetSelected my = new MyTargetSelected(target.getObjectId(), activeChar.getLevel() - ((L2Character) target).getLevel());
-			activeChar.sendPacket(my);
-			
-			// sends HP/MP status of the summon to other characters
-			StatusUpdate su = new StatusUpdate(target);
-			su.addAttribute(StatusUpdate.CUR_HP, (int) ((L2Character) target).getCurrentHp());
-			su.addAttribute(StatusUpdate.MAX_HP, ((L2Character) target).getMaxHp());
-			activeChar.sendPacket(su);
 		}
 		else if (interact)
 		{
-			activeChar.sendPacket(new ValidateLocation((L2Character) target));
 			if (target.isAutoAttackable(activeChar))
 			{
 				if (Config.GEODATA > 0)

+ 1 - 10
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2SummonActionShift.java

@@ -23,10 +23,7 @@ import com.l2jserver.gameserver.handler.IActionHandler;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 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.L2PcInstance;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
-import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 
 public class L2SummonActionShift implements IActionHandler
 {
@@ -39,15 +36,9 @@ public class L2SummonActionShift implements IActionHandler
 			{
 				// Set the target of the L2PcInstance activeChar
 				activeChar.setTarget(target);
-				
-				// Send a Server->Client packet MyTargetSelected to the L2PcInstance activeChar
-				activeChar.sendPacket(new MyTargetSelected(target.getObjectId(), 0));
 			}
 			
-			// Send a Server->Client packet ValidateLocation to correct the L2PcInstance position and heading on the client
-			activeChar.sendPacket(new ValidateLocation((L2Character) target));
-			
-			IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_summon_info");
+			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_summon_info");
 			if (ach != null)
 			{
 				ach.useAdminCommand("admin_summon_info", activeChar);

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/handlers/actionhandlers/L2TrapAction.java

@@ -21,10 +21,8 @@ package handlers.actionhandlers;
 import com.l2jserver.gameserver.handler.IActionHandler;
 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.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 
 public class L2TrapAction implements IActionHandler
 {
@@ -39,8 +37,6 @@ public class L2TrapAction implements IActionHandler
 		}
 		
 		activeChar.setTarget(target);
-		MyTargetSelected my = new MyTargetSelected(target.getObjectId(), activeChar.getLevel() - ((L2Character) target).getLevel());
-		activeChar.sendPacket(my);
 		return true;
 	}
 	

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.effects.EffectTemplate;
 import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.stats.Env;
-import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
 
 /**
  * Target Me effect implementation.
@@ -71,10 +70,6 @@ public class TargetMe extends L2Effect
 				{
 					// Target is different
 					getEffected().setTarget(getEffector());
-					if (getEffected().isPlayer())
-					{
-						getEffected().sendPacket(new MyTargetSelected(getEffector().getObjectId(), 0));
-					}
 				}
 			}
 			((L2Playable) getEffected()).setLockedTarget(getEffector());