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

Sync with L2jServer HighFive Feb 15th 2015.

Browse Source
This commit is contained in:
mobius
2015-02-15 23:48:35 +00:00
parent f2d6aedabe
commit 06c765ea63
45 changed files with 474 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
trunk/dist/game/data/scripts/ai/individual/Beleth.java vendored
View File

@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.enums.ChatType;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
@@ -41,7 +40,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.Skill;
@@ -117,15 +115,11 @@ public final class Beleth extends AbstractNpcAI
{
try
{
L2NpcTemplate template = NpcData.getInstance().getTemplate(npcId);
if (template != null)
{
L2Spawn spawn = new L2Spawn(template);
spawn.setInstanceId(loc.getInstanceId());
spawn.setLocation(loc);
spawn.setAmount(spawn.getAmount() + 1);
return spawn.doSpawn();
}
final L2Spawn spawn = new L2Spawn(npcId);
spawn.setInstanceId(loc.getInstanceId());
spawn.setLocation(loc);
spawn.setAmount(spawn.getAmount() + 1);
return spawn.doSpawn();
}
catch (Exception ignored)
{

4
trunk/dist/game/data/scripts/ai/npc/AbstractNpcAI.java vendored
View File

@@ -18,8 +18,6 @@
*/
package ai.npc;
import java.util.logging.Logger;
import com.l2jserver.gameserver.enums.ChatType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -38,8 +36,6 @@ import com.l2jserver.gameserver.util.Broadcast;
*/
public abstract class AbstractNpcAI extends Quest
{
public final Logger _log = Logger.getLogger(getClass().getSimpleName());
public AbstractNpcAI(String name, String descr)
{
super(-1, name, descr);

3
trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java vendored
View File

@@ -30,7 +30,6 @@ import org.w3c.dom.Node;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.data.xml.IXmlReader;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.L2Territory;
import com.l2jserver.gameserver.model.Location;
@@ -227,7 +226,7 @@ public class TarBeetleSpawn implements IXmlReader
final Location location = _zones.get(Rnd.get(_zones.size())).getRandomPoint();
if (location != null)
{
final L2Spawn spawn = new L2Spawn(NpcData.getInstance().getTemplate(18804));
final L2Spawn spawn = new L2Spawn(18804);
spawn.setHeading(Rnd.get(65535));
spawn.setX(location.getX());
spawn.setY(location.getY());