|
@@ -49,6 +49,7 @@ import com.l2jserver.gameserver.model.L2Object;
|
|
import com.l2jserver.gameserver.model.L2SiegeClan;
|
|
import com.l2jserver.gameserver.model.L2SiegeClan;
|
|
import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
|
|
import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
|
|
import com.l2jserver.gameserver.model.L2Spawn;
|
|
import com.l2jserver.gameserver.model.L2Spawn;
|
|
|
|
+import com.l2jserver.gameserver.model.PcCondOverride;
|
|
import com.l2jserver.gameserver.model.TeleportWhereType;
|
|
import com.l2jserver.gameserver.model.TeleportWhereType;
|
|
import com.l2jserver.gameserver.model.TowerSpawn;
|
|
import com.l2jserver.gameserver.model.TowerSpawn;
|
|
import com.l2jserver.gameserver.model.actor.L2Npc;
|
|
import com.l2jserver.gameserver.model.actor.L2Npc;
|
|
@@ -1039,9 +1040,12 @@ public class Siege implements Siegable
|
|
switch (teleportWho)
|
|
switch (teleportWho)
|
|
{
|
|
{
|
|
case Owner:
|
|
case Owner:
|
|
|
|
+ {
|
|
players = getOwnersInZone();
|
|
players = getOwnersInZone();
|
|
break;
|
|
break;
|
|
|
|
+ }
|
|
case NotOwner:
|
|
case NotOwner:
|
|
|
|
+ {
|
|
players = getPlayersInZone();
|
|
players = getPlayersInZone();
|
|
final Iterator<L2PcInstance> it = players.iterator();
|
|
final Iterator<L2PcInstance> it = players.iterator();
|
|
while (it.hasNext())
|
|
while (it.hasNext())
|
|
@@ -1053,19 +1057,26 @@ public class Siege implements Siegable
|
|
}
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
|
|
+ }
|
|
case Attacker:
|
|
case Attacker:
|
|
|
|
+ {
|
|
players = getAttackersInZone();
|
|
players = getAttackersInZone();
|
|
break;
|
|
break;
|
|
|
|
+ }
|
|
case Spectator:
|
|
case Spectator:
|
|
|
|
+ {
|
|
players = getSpectatorsInZone();
|
|
players = getSpectatorsInZone();
|
|
break;
|
|
break;
|
|
|
|
+ }
|
|
default:
|
|
default:
|
|
|
|
+ {
|
|
players = Collections.<L2PcInstance> emptyList();
|
|
players = Collections.<L2PcInstance> emptyList();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
for (L2PcInstance player : players)
|
|
for (L2PcInstance player : players)
|
|
{
|
|
{
|
|
- if (player.isGM() || player.isJailed())
|
|
|
|
|
|
+ if (player.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS) || player.isJailed())
|
|
{
|
|
{
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|