lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced instanceof L2ServitorInstance with isServitor method.

Browse Source
This commit is contained in:
MobiusDev 2018-07-02 01:14:06 +00:00
parent e9e7d40628
commit b33537aa50
9 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
View File

@ -40,7 +40,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket
_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 L2ServitorInstance) else if (_summon.isServitor())
{ {
final L2ServitorInstance sum = (L2ServitorInstance) _summon; final L2ServitorInstance sum = (L2ServitorInstance) _summon;
_curFed = sum.getLifeTimeRemaining(); _curFed = sum.getLifeTimeRemaining();

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
View File

@ -40,7 +40,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket
_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 L2ServitorInstance) else if (_summon.isServitor())
{ {
final L2ServitorInstance sum = (L2ServitorInstance) _summon; final L2ServitorInstance sum = (L2ServitorInstance) _summon;
_curFed = sum.getLifeTimeRemaining(); _curFed = sum.getLifeTimeRemaining();

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
View File

@ -40,7 +40,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket
_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 L2ServitorInstance) else if (_summon.isServitor())
{ {
final L2ServitorInstance sum = (L2ServitorInstance) _summon; final L2ServitorInstance sum = (L2ServitorInstance) _summon;
_curFed = sum.getLifeTimeRemaining(); _curFed = sum.getLifeTimeRemaining();

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
View File

@ -40,7 +40,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket
_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 L2ServitorInstance) else if (_summon.isServitor())
{ {
final L2ServitorInstance sum = (L2ServitorInstance) _summon; final L2ServitorInstance sum = (L2ServitorInstance) _summon;
_curFed = sum.getLifeTimeRemaining(); _curFed = sum.getLifeTimeRemaining();

3
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java
View File

@ -40,7 +40,6 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.L2Summon;
import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance;
import com.l2jmobius.gameserver.model.events.EventDispatcher; import com.l2jmobius.gameserver.model.events.EventDispatcher;
import com.l2jmobius.gameserver.model.events.impl.events.OnTvTEventFinish; import com.l2jmobius.gameserver.model.events.impl.events.OnTvTEventFinish;
import com.l2jmobius.gameserver.model.events.impl.events.OnTvTEventKill; import com.l2jmobius.gameserver.model.events.impl.events.OnTvTEventKill;
@ -816,7 +815,7 @@ public class TvTEvent
L2PcInstance killerPlayerInstance = null; L2PcInstance killerPlayerInstance = null;
if (killerCharacter.isPet() || (killerCharacter instanceof L2ServitorInstance)) if (killerCharacter.isPet() || killerCharacter.isServitor())
{ {
killerPlayerInstance = ((L2Summon) killerCharacter).getOwner(); killerPlayerInstance = ((L2Summon) killerCharacter).getOwner();

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
View File

@ -40,7 +40,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket
_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 L2ServitorInstance) else if (_summon.isServitor())
{ {
final L2ServitorInstance sum = (L2ServitorInstance) _summon; final L2ServitorInstance sum = (L2ServitorInstance) _summon;
_curFed = sum.getLifeTimeRemaining(); _curFed = sum.getLifeTimeRemaining();

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
View File

@ -40,7 +40,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket
_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 L2ServitorInstance) else if (_summon.isServitor())
{ {
final L2ServitorInstance sum = (L2ServitorInstance) _summon; final L2ServitorInstance sum = (L2ServitorInstance) _summon;
_curFed = sum.getLifeTimeRemaining(); _curFed = sum.getLifeTimeRemaining();

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
View File

@ -40,7 +40,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket
_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 L2ServitorInstance) else if (_summon.isServitor())
{ {
final L2ServitorInstance sum = (L2ServitorInstance) _summon; final L2ServitorInstance sum = (L2ServitorInstance) _summon;
_curFed = sum.getLifeTimeRemaining(); _curFed = sum.getLifeTimeRemaining();

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
View File

@ -40,7 +40,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket
_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 L2ServitorInstance) else if (_summon.isServitor())
{ {
final L2ServitorInstance sum = (L2ServitorInstance) _summon; final L2ServitorInstance sum = (L2ServitorInstance) _summon;
_curFed = sum.getLifeTimeRemaining(); _curFed = sum.getLifeTimeRemaining();