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

5
trunk/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java
View File

@@ -29,7 +29,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.AirShipTeleportList;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.VehiclePathPoint;
@@ -104,7 +103,7 @@ public class AirShipManager
public L2AirShipInstance getNewAirShip(int x, int y, int z, int heading)
{
final L2AirShipInstance airShip = new L2AirShipInstance(IdFactory.getInstance().getNextId(), _airShipTemplate);
final L2AirShipInstance airShip = new L2AirShipInstance(_airShipTemplate);
airShip.setHeading(heading);
airShip.setXYZInvisible(x, y, z);
@@ -130,7 +129,7 @@ public class AirShipManager
}
else
{
airShip = new L2ControllableAirShipInstance(IdFactory.getInstance().getNextId(), _airShipTemplate, ownerId);
airShip = new L2ControllableAirShipInstance(_airShipTemplate, ownerId);
_airShips.put(ownerId, airShip);
airShip.setMaxFuel(600);

5
trunk/java/com/l2jserver/gameserver/instancemanager/BoatManager.java
View File

@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.Config;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.VehiclePathPoint;
@@ -103,8 +102,8 @@ public class BoatManager
npcDat.set("baseMpReg", 3.e-3f);
npcDat.set("basePDef", 100);
npcDat.set("baseMDef", 100);
L2CharTemplate template = new L2CharTemplate(npcDat);
L2BoatInstance boat = new L2BoatInstance(IdFactory.getInstance().getNextId(), template);
L2BoatInstance boat = new L2BoatInstance(new L2CharTemplate(npcDat));
_boats.put(boat.getObjectId(), boat);
boat.setHeading(heading);
boat.setXYZInvisible(x, y, z);

2
trunk/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java
View File

@@ -352,7 +352,7 @@ public final class MercTicketManager
L2NpcTemplate template = NpcData.getInstance().getTemplate(npcId);
if (template != null)
{
final L2DefenderInstance npc = new L2DefenderInstance(IdFactory.getInstance().getNextId(), template);
final L2DefenderInstance npc = new L2DefenderInstance(template);
npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
npc.setDecayed(false);
npc.spawnMe(x, y, (z + 20));