Code improvements.

This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions

View File

@@ -56,16 +56,7 @@ public class ChatAdmin implements IVoicedCommandHandler
if (st.hasMoreTokens())
{
final String name = st.nextToken();
long expirationTime = 0;
if (st.hasMoreTokens())
{
final String token = st.nextToken();
if (Util.isDigit(token))
{
expirationTime = System.currentTimeMillis() + (Integer.parseInt(st.nextToken()) * 60 * 1000);
}
}
final long expirationTime = st.hasMoreTokens() && Util.isDigit(st.nextToken()) ? System.currentTimeMillis() + (Integer.parseInt(st.nextToken()) * 60 * 1000) : 0;
final int objId = CharNameTable.getInstance().getIdByName(name);
if (objId > 0)
{

View File

@@ -39,7 +39,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.L2Event;
import com.l2jmobius.gameserver.model.entity.TvTEvent;
import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.zone.ZoneId;
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import com.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
@@ -166,10 +165,9 @@ public class Wedding implements IVoicedCommandHandler
skillId = 4361;
}
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (!activeChar.isAffectedBySkill(skillId))
{
skill.applyEffects(activeChar, activeChar);
SkillData.getInstance().getSkill(skillId, skillLevel).applyEffects(activeChar, activeChar);
}
}
return false;