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

2
trunk/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java vendored
View File

@@ -20,7 +20,7 @@ package handlers.bypasshandlers;
import java.util.logging.Level;
import com.l2jserver.gameserver.datatables.MultisellData;
import com.l2jserver.gameserver.data.xml.impl.MultisellData;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;

19
trunk/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java vendored
View File

@@ -23,9 +23,9 @@ import java.util.List;
import java.util.logging.Level;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.MultisellData;
import com.l2jserver.gameserver.datatables.NpcBufferTable;
import com.l2jserver.gameserver.datatables.NpcBufferTable.NpcBufferData;
import com.l2jserver.gameserver.data.sql.impl.NpcBufferTable;
import com.l2jserver.gameserver.data.sql.impl.NpcBufferTable.NpcBufferData;
import com.l2jserver.gameserver.data.xml.impl.MultisellData;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -279,12 +279,17 @@ public class OlympiadManagerLink implements IBypassHandler
target.broadcastPacket(new MagicSkillUse(target, activeChar, skill.getId(), skill.getLevel(), 0, 0));
skill.applyEffects(activeChar, activeChar);
final L2Summon summon = activeChar.getSummon();
if (summon != null)
final L2Summon pet = activeChar.getPet();
if (pet != null)
{
target.broadcastPacket(new MagicSkillUse(target, summon, skill.getId(), skill.getLevel(), 0, 0));
skill.applyEffects(summon, summon);
target.broadcastPacket(new MagicSkillUse(target, pet, skill.getId(), skill.getLevel(), 0, 0));
skill.applyEffects(pet, pet);
}
activeChar.getServitors().values().forEach(s ->
{
target.broadcastPacket(new MagicSkillUse(target, s, skill.getId(), skill.getLevel(), 0, 0));
skill.applyEffects(s, s);
});
}
}

2
trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java vendored
View File

@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import com.l2jserver.gameserver.datatables.NpcData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.actor.L2Character;

2
trunk/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java vendored
View File

@@ -22,7 +22,7 @@ import java.util.List;
import java.util.logging.Level;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;

31
trunk/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java vendored
View File

@@ -99,7 +99,7 @@ public class SupportMagic implements IBypassHandler
private static void makeSupportMagic(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final int level = player.getLevel();
if (isSummon && !player.hasServitor())
if (isSummon && !player.hasServitors())
{
npc.showChatWindow(player, "data/html/default/SupportMagicNoSummon.htm");
return;
@@ -122,20 +122,23 @@ public class SupportMagic implements IBypassHandler
if (isSummon)
{
npc.setTarget(player.getSummon());
for (SkillHolder skill : SUMMON_BUFFS)
player.getServitors().values().forEach(s ->
{
npc.doCast(skill.getSkill());
}
if (level >= HASTE_LEVEL_2)
{
npc.doCast(HASTE_2.getSkill());
}
else
{
npc.doCast(HASTE_1.getSkill());
}
npc.setTarget(s);
for (SkillHolder skill : SUMMON_BUFFS)
{
npc.doCast(skill.getSkill());
}
if (level >= HASTE_LEVEL_2)
{
npc.doCast(HASTE_2.getSkill());
}
else
{
npc.doCast(HASTE_1.getSkill());
}
});
}
else
{

2
trunk/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java vendored
View File

@@ -18,7 +18,7 @@
*/
package handlers.bypasshandlers;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.L2Character;

2
trunk/dist/game/data/scripts/handlers/bypasshandlers/Wear.java vendored
View File

@@ -22,7 +22,7 @@ import java.util.StringTokenizer;
import java.util.logging.Level;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.BuyListData;
import com.l2jserver.gameserver.data.xml.impl.BuyListData;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;