2
0
Эх сурвалжийг харах

Core support for dependOnTargetBuff skill attrib.

JIV 15 жил өмнө
parent
commit
6d560aa5b3

+ 7 - 0
L2_GameServer/java/com/l2jserver/gameserver/model/L2Skill.java

@@ -235,6 +235,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
     private final int _numSouls;
     private final int _numSouls;
     private final int _expNeeded;
     private final int _expNeeded;
     private final int _critChance;
     private final int _critChance;
+    private final float _dependOnTargetBuff;
     
     
     private final int _transformId;
     private final int _transformId;
     private final int _transformDuration;
     private final int _transformDuration;
@@ -458,6 +459,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
         _canBeDispeled = set.getBool("canBeDispeled", true);
         _canBeDispeled = set.getBool("canBeDispeled", true);
         
         
         _isClanSkill = set.getBool("isClanSkill", false);
         _isClanSkill = set.getBool("isClanSkill", false);
+        _dependOnTargetBuff = set.getFloat("dependOnTargetBuff", 0);
     }
     }
 
 
     public abstract void useSkill(L2Character caster, L2Object[] targets);
     public abstract void useSkill(L2Character caster, L2Object[] targets);
@@ -2676,4 +2678,9 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	{
 	{
 		return _isClanSkill;
 		return _isClanSkill;
 	}
 	}
+
+	public float getDependOnTargetBuff()
+	{
+		return _dependOnTargetBuff;
+	}
 }
 }

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java

@@ -395,7 +395,7 @@ public class DimensionalRift
 			//int min = Config.RIFT_MIN_PARTY_SIZE;
 			//int min = Config.RIFT_MIN_PARTY_SIZE;
 			
 			
 			for (L2PcInstance p : _party.getPartyMembers())
 			for (L2PcInstance p : _party.getPartyMembers())
-				if (!revivedInWaitingRoom.contains(p))
+				if (p != null && !revivedInWaitingRoom.contains(p))
 					teleportToWaitingRoom(p);
 					teleportToWaitingRoom(p);
 			killRift();
 			killRift();
 		}
 		}

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/Say2.java

@@ -241,7 +241,7 @@ public final class Say2 extends L2GameClientPacket
 			}
 			}
 			else
 			else
 			{
 			{
-				_log.info(getClient() + " trying publish object which is not item! ID:" + id);
+				_log.info(getClient() + " trying publish object which is not item! Object:" + item);
 				return false;
 				return false;
 			}
 			}
 			pos1 = _text.indexOf(8, pos) + 1;
 			pos1 = _text.indexOf(8, pos) + 1;