Browse Source

Fix for Kamael rush skills (not targetable character).

JIV 15 years ago
parent
commit
aee1f72bf7

+ 9 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -90,7 +90,6 @@ import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.StopMove;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.network.serverpackets.TeleportToLocation;
-import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
 import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
 import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
 import com.l2jserver.gameserver.pathfinding.PathFinding;
@@ -2657,7 +2656,6 @@ public abstract class L2Character extends L2Object
 
 				broadcastPacket(new FlyToLocation(_actor,_tgt,_flyType));
 				setXYZ(_tgt.getX(), _tgt.getY(), _tgt.getZ());
-				broadcastPacket(new ValidateLocation(_actor));
 			}
 			catch (Exception e)
 			{
@@ -6986,4 +6984,13 @@ public abstract class L2Character extends L2Object
     	_isRaid = val;
     	_isMinion = val;
     }
+    
+	/**
+	 * Overridden in L2GrandBossInstance
+	 * @return true
+	 */
+	public boolean giveRaidCurse()
+	{
+		return true;
+	}
 }

+ 9 - 6
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/FlyToLocation.java

@@ -23,8 +23,8 @@ import com.l2jserver.gameserver.model.actor.L2Character;
  */
 public final class FlyToLocation extends L2GameServerPacket
 {
-    private final L2Character _cha;
     private final int _destX, _destY, _destZ;
+    private final int _chaObjId, _chaX, _chaY, _chaZ;
     private final FlyType _type;
     
     public enum FlyType
@@ -37,7 +37,10 @@ public final class FlyToLocation extends L2GameServerPacket
     
     public FlyToLocation(L2Character cha, int destX, int destY, int destZ, FlyType type)
     {
-        _cha = cha;
+    	_chaObjId = cha.getObjectId();
+        _chaX = cha.getX();
+        _chaY = cha.getY();
+        _chaZ = cha.getZ();
         _destX = destX;
         _destY = destY;
         _destZ = destZ;
@@ -65,13 +68,13 @@ public final class FlyToLocation extends L2GameServerPacket
     protected void writeImpl()
     {
         writeC(0xd4);
-        writeD(_cha.getObjectId());
+        writeD(_chaObjId);
         writeD(_destX);
         writeD(_destY);
         writeD(_destZ);
-        writeD(_cha.getX());
-        writeD(_cha.getY());
-        writeD(_cha.getZ());
+        writeD(_chaX);
+        writeD(_chaY);
+        writeD(_chaZ);
         writeD(_type.ordinal());
     }