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

4
trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java vendored
View File

@ -23,8 +23,8 @@ import java.util.Map;
import java.util.Map.Entry;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.L2Npc;

4
trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java vendored
View File

@ -23,8 +23,8 @@ import java.util.Map;
import java.util.Map.Entry;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.Location;

2
trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java vendored
View File

@ -24,7 +24,7 @@ import java.util.Map.Entry;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;

14
trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@ -34,8 +34,8 @@ import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
@ -47,6 +47,7 @@ import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.TeleportWhereType;
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.L2PcInstance;
import com.l2jserver.gameserver.model.entity.clanhall.ClanHallSiegeEngine;
import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
@ -692,10 +693,15 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
if (pc != null)
{
pc.stopAllEffects();
if (pc.hasSummon())
final L2Summon pet = pc.getPet();
if (pet != null)
{
pc.getSummon().unSummon(pc);
pet.unSummon(pc);
}
pc.getServitors().values().forEach(s ->
{
s.unSummon(pc);
});
pc.teleToLocation(ARENAS[arena]);
}
}

4
trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java vendored
View File

@ -31,8 +31,8 @@ import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.ai.L2SpecialSiegeGuardAI;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.enums.SiegeClanType;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2ClanMember;

10
trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/messenger_initial.htm vendored
View File

@ -1,8 +1,8 @@
<html><body>
Are you ready? Remember, these are wild animals! Don't let them bite you! It won't be easy!<br>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest WildBeastReserve register_clan">Clan Register (Leader)</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest WildBeastReserve messenger_allychoose.htm">Choose Clan NPC (Leader)</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest WildBeastReserve view_clan_npc">See Clan NPC (Member)</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest WildBeastReserver register_member">Clan Member Register (Member)</Button><br>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest 655_AGrandPlanforTamingWildBeasts">Quest</Button>
<a action="bypass -h Quest WildBeastReserve register_clan">Clan Register (Leader)</a><br>
<a action="bypass -h Quest WildBeastReserve messenger_allychoose.htm">Choose Clan NPC (Leader)</a><br>
<a action="bypass -h Quest WildBeastReserve view_clan_npc">See Clan NPC (Member)</a><br>
<a action="bypass -h Quest WildBeastReserver register_member">Clan Member Register (Member)</a><br><br>
<a action="bypass -h npc_%objectId%_Quest">Quest</a>
</body></html>

6
trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/messenger_nonsiegeinitial.htm vendored
View File

@ -1,7 +1,7 @@
<html><body>Messenger:<br>
What brings you to this place? I can't be responsible for your safety here!<br>
Unless, that is, you're a member of the <font color=00ffff><?my_pledge_name?></font> Clan in charge of the farm.<br>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest 655_AGrandPlanforTamingWildBeasts">Qualification Test for Clan Hall Battle Registration</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest WildBeastReserve register_clan">Register for Clan Hall Battle</Button>
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest WildBeastReserve view_attacker_list">Clans Participating in the Preliminaries</Button>
<a action="bypass -h npc_%objectId%_Quest">Qualification Test for Clan Hall Battle Registration</a><br>
<a action="bypass -h Quest WildBeastReserve register_clan">Register for Clan Hall Battle</a><br>
<a action="bypass -h Quest WildBeastReserve view_attacker_list">Clans Participating in the Preliminaries</a>
</body></html>