Project cleanup pre merge.
This commit is contained in:
@@ -24,55 +24,55 @@ import java.util.HashMap;
|
||||
|
||||
public class InvisPowerAction extends AbstractPowerAction {
|
||||
|
||||
private String effectID;
|
||||
private EffectsBase effect;
|
||||
private String effectID;
|
||||
private EffectsBase effect;
|
||||
|
||||
public InvisPowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException {
|
||||
super(rs);
|
||||
public InvisPowerAction(ResultSet rs, HashMap<String, EffectsBase> effects) throws SQLException {
|
||||
super(rs);
|
||||
|
||||
this.effectID = rs.getString("effectID");
|
||||
this.effect = effects.get(this.effectID);
|
||||
}
|
||||
this.effectID = rs.getString("effectID");
|
||||
this.effect = effects.get(this.effectID);
|
||||
}
|
||||
|
||||
public String getEffectID() {
|
||||
return this.effectID;
|
||||
}
|
||||
public String getEffectID() {
|
||||
return this.effectID;
|
||||
}
|
||||
|
||||
public EffectsBase getEffect() {
|
||||
return this.effect;
|
||||
}
|
||||
public EffectsBase getEffect() {
|
||||
return this.effect;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
|
||||
if (this.effect == null || pb == null || ab == null) {
|
||||
//TODO log error here
|
||||
return;
|
||||
}
|
||||
@Override
|
||||
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
|
||||
if (this.effect == null || pb == null || ab == null) {
|
||||
//TODO log error here
|
||||
return;
|
||||
}
|
||||
|
||||
// if (this.effect.ignoreMod())
|
||||
// trains = 50; //set above see invis for safe mode and csr-invis
|
||||
// if (this.effect.ignoreMod())
|
||||
// trains = 50; //set above see invis for safe mode and csr-invis
|
||||
|
||||
//add schedule job to end it if needed and add effect to pc
|
||||
int duration = ab.getDuration(trains);
|
||||
String stackType = ab.getStackType();
|
||||
FinishEffectTimeJob eff = new FinishEffectTimeJob(source, awo, stackType, trains, ab, pb, this.effect);
|
||||
if (duration > 0) {
|
||||
if (stackType.equals("IgnoreStack"))
|
||||
awo.addEffect(Integer.toString(ab.getUUID()), duration, eff, this.effect, trains);
|
||||
else
|
||||
awo.addEffect(stackType, duration, eff, this.effect, trains);
|
||||
}
|
||||
this.effect.startEffect(source, awo, trains, eff);
|
||||
}
|
||||
//add schedule job to end it if needed and add effect to pc
|
||||
int duration = ab.getDuration(trains);
|
||||
String stackType = ab.getStackType();
|
||||
FinishEffectTimeJob eff = new FinishEffectTimeJob(source, awo, stackType, trains, ab, pb, this.effect);
|
||||
if (duration > 0) {
|
||||
if (stackType.equals("IgnoreStack"))
|
||||
awo.addEffect(Integer.toString(ab.getUUID()), duration, eff, this.effect, trains);
|
||||
else
|
||||
awo.addEffect(stackType, duration, eff, this.effect, trains);
|
||||
}
|
||||
this.effect.startEffect(source, awo, trains, eff);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void _handleChant(AbstractCharacter source, AbstractWorldObject target, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
|
||||
}
|
||||
@Override
|
||||
protected void _handleChant(AbstractCharacter source, AbstractWorldObject target, Vector3fImmutable targetLoc, int trains, ActionsBase ab, PowersBase pb) {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc,
|
||||
int numTrains, ActionsBase ab, PowersBase pb, int duration) {
|
||||
// TODO Auto-generated method stub
|
||||
@Override
|
||||
protected void _startAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc,
|
||||
int numTrains, ActionsBase ab, PowersBase pb, int duration) {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user