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

Sync with L2jServer Ertheia Mar 27th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-03-28 08:46:39 +00:00
parent a8a6d2153b
commit 855ced1dc5
23 changed files with 93 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
View File

@@ -5587,7 +5587,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
abortCast();
return;
}
mut.setTargets(targetList.toArray(new L2Character[targetList.size()]));
mut.setTargets(targetList.toArray(new L2Object[targetList.size()]));
}
// Ensure that a cast is in progress

7
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2ShuttleInstance.java
View File

@@ -43,7 +43,12 @@ public class L2ShuttleInstance extends L2Vehicle
{
super(template);
setInstanceType(InstanceType.L2ShuttleInstance);
setAI(new L2ShuttleAI(this));
}
@Override
public L2ShuttleAI initAI()
{
return new L2ShuttleAI(this);
}
public List<L2ShuttleStop> getStops()

2
trunk/java/com/l2jserver/gameserver/model/holders/InstanceReenterTimeHolder.java
View File

@@ -21,7 +21,7 @@ package com.l2jserver.gameserver.model.holders;
import java.time.DayOfWeek;
/**
* Simple class for storing Reenter Data for Intances.
* Simple class for storing Reenter Data for Instances.
* @author FallenAngel
*/
public final class InstanceReenterTimeHolder

4
trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java
View File

@@ -452,9 +452,11 @@ public final class Formulas
*/
public static final double calcCpRegen(L2PcInstance player)
{
double cpRegenMultiplier = Config.CP_REGEN_MULTIPLIER;
// With CON bonus
final double init = player.getActingPlayer().getTemplate().getBaseCpRegen(player.getLevel()) * player.getLevelMod() * BaseStats.CON.calcBonus(player);
double cpRegenMultiplier = Config.CP_REGEN_MULTIPLIER;
// Calculate Movement bonus
if (player.isSitting())
{
cpRegenMultiplier *= 1.5; // Sitting