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

another attempt to fix rb/minions, please report issues on forum

janiii 15 жил өмнө
parent
commit
e1d7223d2a

+ 8 - 8
L2_GameServer/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -2217,9 +2217,9 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			if(dist2<=range)
 			{
 				if(MostHate!=null)
-					actor.addDamageHate(obj,actor.getHating(MostHate),actor.getHating(MostHate));
+					actor.addDamageHate(obj,0,actor.getHating(MostHate));
 				else
-					actor.addDamageHate(obj,2000,2000);
+					actor.addDamageHate(obj,0,2000);
 				_actor.setTarget(obj);
 				setAttackTarget(obj);
 				return;
@@ -2239,9 +2239,9 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				if(obj instanceof L2PcInstance)
 				{
 					if(MostHate != null)
-						actor.addDamageHate(obj,actor.getHating(MostHate),actor.getHating(MostHate));
+						actor.addDamageHate(obj,0,actor.getHating(MostHate));
 					else
-						actor.addDamageHate(obj,2000,2000);
+						actor.addDamageHate(obj,0,2000);
 					_actor.setTarget(obj);
 					setAttackTarget(obj);
 					
@@ -2260,9 +2260,9 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						else
 						{
 							if(MostHate != null)
-								actor.addDamageHate(obj,actor.getHating(MostHate),actor.getHating(MostHate));
+								actor.addDamageHate(obj,0,actor.getHating(MostHate));
 							else
-								actor.addDamageHate(obj,2000,2000);
+								actor.addDamageHate(obj,0,2000);
 							_actor.setTarget(obj);
 							setAttackTarget(obj);
 						}
@@ -2271,9 +2271,9 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				else if(obj instanceof L2Summon)
 				{
 					if(MostHate != null)
-						actor.addDamageHate(obj,actor.getHating(MostHate),actor.getHating(MostHate));
+						actor.addDamageHate(obj,0,actor.getHating(MostHate));
 					else
-						actor.addDamageHate(obj,2000,2000);
+						actor.addDamageHate(obj,0,2000);
 					_actor.setTarget(obj);
 					setAttackTarget(obj);
 				}

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

@@ -878,7 +878,7 @@ public class L2Attackable extends L2Npc
 				{
 					if (getTemplate().getEventQuests(Quest.QuestEventType.ON_ATTACK) !=null)
 						for (Quest quest: getTemplate().getEventQuests(Quest.QuestEventType.ON_ATTACK))
-					quest.notifyAttack(this, player, damage, attacker instanceof L2Summon, skill);
+							quest.notifyAttack(this, player, damage, attacker instanceof L2Summon, skill);
 				}
 				// for now hard code damage hate caused by an L2Attackable
 				else

+ 6 - 6
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2MonsterInstance.java

@@ -189,14 +189,14 @@ public class L2MonsterInstance extends L2Attackable
 		{
 			for (L2MinionInstance minion : _minionList.getSpawnedMinions())
 			{
-				if (minion == null || attacker == null || minion.isDead() || minion.isInCombat()
-						|| minion.getAggroList().containsKey(attacker))
+				if (minion == null || attacker == null || minion.isDead() || minion.isInCombat())
 					continue;
 
 				// Trigger the aggro condition of the minion
-				if(isRaid()&&!isRaidMinion())
-					minion.addDamage(attacker, 100, null);
-				else minion.addDamage(attacker, 1, null);
+				if (isRaid() && !isRaidMinion())
+					minion.addDamageHate(attacker, 0, 100);
+				else
+					minion.addDamageHate(attacker, 0, 1);
 			}
 		}
 	}
@@ -257,7 +257,7 @@ public class L2MonsterInstance extends L2Attackable
 	
 	public void notifyMinionAttacked(L2Character attacker, L2MinionInstance minion)
 	{
-		addDamage(attacker, 1, null);
+		addDamageHate(attacker, 0, 1);
 		callMinionsToAssist(attacker);
 	}
 

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PenaltyMonsterInstance.java

@@ -48,7 +48,7 @@ public class L2PenaltyMonsterInstance extends L2MonsterInstance
 			this.broadcastPacket(cs);
 		}
 		_ptk = ptk;
-		addDamageHate(ptk, 10, 10);
+		addDamageHate(ptk, 0, 10);
 		getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, ptk);
 		addAttackerToAttackByList(ptk);
 	}