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

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
trunk/dist/game/data/scripts/instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java vendored
View File

@@ -37,6 +37,7 @@ import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -1170,11 +1171,14 @@ public final class IceQueensCastleNormalBattle extends AbstractNpcAI
if (world instanceof IQCNBWorld)
{
player.stopAllEffectsExceptThoseThatLastThroughDeath();
if (player.hasSummon())
final L2Summon pet = player.getPet();
if (pet != null)
{
player.getSummon().stopAllEffectsExceptThoseThatLastThroughDeath();
pet.stopAllEffectsExceptThoseThatLastThroughDeath();
}
player.getServitors().values().forEach(L2Summon::stopAllEffectsExceptThoseThatLastThroughDeath);
if (world.isStatus(4))
{
teleportPlayer(player, BATTLE_PORT, world.getInstanceId());
@@ -1222,10 +1226,12 @@ public final class IceQueensCastleNormalBattle extends AbstractNpcAI
private void managePlayerEnter(L2PcInstance player, IQCNBWorld world)
{
player.stopAllEffectsExceptThoseThatLastThroughDeath();
if (player.hasSummon())
final L2Summon pet = player.getPet();
if (pet != null)
{
player.getSummon().stopAllEffectsExceptThoseThatLastThroughDeath();
pet.stopAllEffectsExceptThoseThatLastThroughDeath();
}
player.getServitors().values().forEach(L2Summon::stopAllEffectsExceptThoseThatLastThroughDeath);
world.playersInside.add(player);
world.addAllowed(player.getObjectId());
teleportPlayer(player, ENTER_LOC[getRandom(ENTER_LOC.length)], world.getInstanceId(), false);