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

Fixed Baylor NPE.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-09-27 22:47:24 +00:00
parent 1ed370c81a
commit 309e912f7b
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/GrandBossInstance.java
View File

@@ -20,7 +20,6 @@ import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.InstanceType; import org.l2jmobius.gameserver.enums.InstanceType;
import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager; import org.l2jmobius.gameserver.instancemanager.RaidBossPointsManager;
import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate; import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.entity.Hero; import org.l2jmobius.gameserver.model.entity.Hero;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -60,19 +59,11 @@ public class GrandBossInstance extends MonsterInstance
{ {
return false; return false;
} }
PlayerInstance player = null;
if (killer.isPlayer()) if ((killer != null) && (killer.getActingPlayer() != null))
{ {
player = (PlayerInstance) killer; final PlayerInstance player = killer.getActingPlayer();
}
else if (killer.isSummon())
{
player = ((Summon) killer).getOwner();
}
if (player != null)
{
broadcastPacket(new SystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL)); broadcastPacket(new SystemMessage(SystemMessageId.CONGRATULATIONS_YOUR_RAID_WAS_SUCCESSFUL));
if (player.getParty() != null) if (player.getParty() != null)
{ {