Browse Source

Summon PvP flag and karma, thanks jiv.

_DS_ 15 years ago
parent
commit
c74637e3b8

+ 11 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/L2Summon.java

@@ -302,7 +302,17 @@ public abstract class L2Summon extends L2Playable
         return getOwner()!= null ? getOwner().getKarma() : 0;
     }
 
-    public final L2PcInstance getOwner()
+	public final byte getPvpFlag()
+    {
+        return getOwner()!= null ? getOwner().getPvpFlag() : 0;
+    }
+
+	public final int getTeam()
+	{
+        return getOwner()!= null ? getOwner().getTeam() : 0;		
+	}
+
+	public final L2PcInstance getOwner()
     {
     	return _owner;
     }

+ 2 - 2
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/AbstractNpcInfo.java

@@ -583,7 +583,7 @@ public abstract class AbstractNpcInfo extends L2GameServerPacket
 			writeD(0x01);// Title color 0=client default
 
 			writeD(0);
-			writeD(_summon.getOwner().getPvpFlag());
+			writeD(_summon.getPvpFlag());
 
 			if (gmSeeInvis)
 				writeD(_summon.getAbnormalEffect() | L2Character.ABNORMAL_EFFECT_STEALTH);
@@ -595,7 +595,7 @@ public abstract class AbstractNpcInfo extends L2GameServerPacket
 			writeD(0000);  // C2
 			writeC(0000);  // C2
 
-			writeC(_summon.getOwner().getTeam());// Title color 0=client default  
+			writeC(_summon.getTeam());// Title color 0=client default  
 			
 			writeF(_collisionRadius);
 			writeF(_collisionHeight);