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

Sync with L2jServer HighFive Feb 10th 2015.

Browse Source
This commit is contained in:
mobius
2015-02-10 22:49:31 +00:00
parent 4dc2666fa4
commit 431b4cacdf
98 changed files with 636 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
trunk/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java vendored
View File

@@ -19,7 +19,6 @@
package handlers.effecthandlers;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.instancemanager.FortManager;
@@ -64,7 +63,7 @@ public final class HeadquarterCreate extends AbstractEffect
return;
}
final L2SiegeFlagInstance flag = new L2SiegeFlagInstance(player, IdFactory.getInstance().getNextId(), NpcData.getInstance().getTemplate(HQ_NPC_ID), _isAdvanced, false);
final L2SiegeFlagInstance flag = new L2SiegeFlagInstance(player, NpcData.getInstance().getTemplate(HQ_NPC_ID), _isAdvanced, false);
flag.setTitle(player.getClan().getName());
flag.setCurrentHpMp(flag.getMaxHp(), flag.getMaxMp());
flag.setHeading(player.getHeading());

3
trunk/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -21,7 +21,6 @@ package handlers.effecthandlers;
import com.l2jserver.gameserver.data.xml.impl.ExperienceData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
@@ -77,7 +76,7 @@ public final class Summon extends AbstractEffect
final L2PcInstance player = info.getEffected().getActingPlayer();
final L2NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final L2ServitorInstance summon = new L2ServitorInstance(IdFactory.getInstance().getNextId(), template, player);
final L2ServitorInstance summon = new L2ServitorInstance(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
summon.setName(template.getName());

5
trunk/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java vendored
View File

@@ -19,7 +19,6 @@
package handlers.effecthandlers;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.StatsSet;
@@ -101,7 +100,7 @@ public final class SummonNpc extends AbstractEffect
{
case "L2Decoy":
{
final L2DecoyInstance decoy = new L2DecoyInstance(IdFactory.getInstance().getNextId(), npcTemplate, player, _despawnDelay);
final L2DecoyInstance decoy = new L2DecoyInstance(npcTemplate, player, _despawnDelay);
decoy.setCurrentHp(decoy.getMaxHp());
decoy.setCurrentMp(decoy.getMaxMp());
decoy.setHeading(player.getHeading());
@@ -113,7 +112,7 @@ public final class SummonNpc extends AbstractEffect
}
case "L2EffectPoint": // TODO: Implement proper signet skills.
{
final L2EffectPointInstance effectPoint = new L2EffectPointInstance(IdFactory.getInstance().getNextId(), npcTemplate, player);
final L2EffectPointInstance effectPoint = new L2EffectPointInstance(npcTemplate, player);
effectPoint.setCurrentHp(effectPoint.getMaxHp());
effectPoint.setCurrentMp(effectPoint.getMaxMp());
int x = player.getX();

3
trunk/dist/game/data/scripts/handlers/effecthandlers/SummonTrap.java vendored
View File

@@ -19,7 +19,6 @@
package handlers.effecthandlers;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
@@ -84,7 +83,7 @@ public final class SummonTrap extends AbstractEffect
return;
}
final L2TrapInstance trap = new L2TrapInstance(IdFactory.getInstance().getNextId(), npcTemplate, player, _despawnTime);
final L2TrapInstance trap = new L2TrapInstance(npcTemplate, player, _despawnTime);
trap.setCurrentHp(trap.getMaxHp());
trap.setCurrentMp(trap.getMaxMp());
trap.setIsInvul(true);