Quellcode durchsuchen

Removing unncessary check

DrHouse vor 16 Jahren
Ursprung
Commit
fa4204ec09
1 geänderte Dateien mit 5 neuen und 3 gelöschten Zeilen
  1. 5 3
      L2_GameServer/java/net/sf/l2j/gameserver/model/L2Effect.java

+ 5 - 3
L2_GameServer/java/net/sf/l2j/gameserver/model/L2Effect.java

@@ -168,19 +168,21 @@ public abstract class L2Effect
 		_count = template.counter;
 		_totalCount = _count;
 		
-		// TODO DrHouse: This should be reworked, we need to be able to change effect time out of Effect Constructor
-		// maybe using a child class
 		// Support for retail herbs duration when _effected has a Summon 
 		int temp = template.period;
+		
 		if ((_skill.getId() > 2277 && _skill.getId() < 2286) || (_skill.getId() >= 2512 && _skill.getId() <= 2514))
 		{
-			if (_effected instanceof L2SummonInstance || (_effected instanceof L2PcInstance && ((L2PcInstance) _effected).getPet() != null && ((L2PcInstance) _effected).getPet() instanceof L2SummonInstance))
+			if (_effected instanceof L2SummonInstance || 
+					(_effected instanceof L2PcInstance && ((L2PcInstance) _effected).getPet() instanceof L2SummonInstance))
 			{
 				temp /= 2;
 			}
 		}
+		
 		if (env.skillMastery)
 			temp *= 2;
+		
 		_period = temp;
 		_abnormalEffect = template.abnormalEffect;
 		_stackType = template.stackType;