Bläddra i källkod

Fix for Summon lifetime bar.

Gigiikun 15 år sedan
förälder
incheckning
e7887ae1ad

+ 8 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PetInfo.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
 
 
 /**
 /**
  * This class ...
  * This class ...
@@ -60,11 +61,17 @@ public class PetInfo extends L2GameServerPacket
 		_maxMp = _summon.getMaxMp();
 		_maxMp = _summon.getMaxMp();
 		_val = val;
 		_val = val;
 		if (_summon instanceof L2PetInstance)
 		if (_summon instanceof L2PetInstance)
-        {
+		{
 			L2PetInstance pet = (L2PetInstance)_summon;
 			L2PetInstance pet = (L2PetInstance)_summon;
 			_curFed = pet.getCurrentFed(); // how fed it is
 			_curFed = pet.getCurrentFed(); // how fed it is
 			_maxFed = pet.getMaxFed(); //max fed it can be
 			_maxFed = pet.getMaxFed(); //max fed it can be
 		}
 		}
+		else if (_summon instanceof L2SummonInstance)
+		{
+			L2SummonInstance sum = (L2SummonInstance)_summon;
+			_curFed = sum.getTimeRemaining(); 
+			_maxFed = sum.getTotalLifeTime();
+		}
 	}
 	}
 
 
 	@Override
 	@Override

+ 7 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/PetStatusUpdate.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
 
 
 /**
 /**
  * This class ...
  * This class ...
@@ -41,6 +42,12 @@ public class PetStatusUpdate extends L2GameServerPacket
 			_curFed = pet.getCurrentFed(); // how fed it is
 			_curFed = pet.getCurrentFed(); // how fed it is
 			_maxFed = pet.getMaxFed(); //max fed it can be
 			_maxFed = pet.getMaxFed(); //max fed it can be
 		}
 		}
+		else if (_summon instanceof L2SummonInstance)
+		{
+			L2SummonInstance sum = (L2SummonInstance)_summon;
+			_curFed = sum.getTimeRemaining();
+			_maxFed = sum.getTotalLifeTime();
+		}
 	}
 	}
 
 
 	@Override
 	@Override