diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java index bb3ba5d0cf..6cfe224d2b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java @@ -1364,7 +1364,7 @@ public class AdminCommands extends Thread if (skill.getTargetType() == 0) { activeChar.setTarget(activeChar); - MagicSkillUser msk = new MagicSkillUser(activeChar, skillid, 1, skill.getSkillTime(), skill.getReuseDelay()); + MagicSkillUser msk = new MagicSkillUser(activeChar, skillid, 1, skill.getHitTime(), skill.getReuseDelay()); activeChar.sendPacket(msk); activeChar.broadcastPacket(msk); // ActionFailed af = new ActionFailed(); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/ISkillHandler.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/ISkillHandler.java index 7997d4abb3..55f2fad074 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/ISkillHandler.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/ISkillHandler.java @@ -17,15 +17,13 @@ */ package org.l2jmobius.gameserver.handler; -import java.io.IOException; - import org.l2jmobius.gameserver.model.Skill; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public interface ISkillHandler { - public void useSkill(PlayerInstance var1, Skill var2, WorldObject var3) throws IOException; + public void useSkill(PlayerInstance var1, Skill var2, WorldObject var3); public int[] getSkillIds(); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 523be2ae53..66d5e38d17 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -17,9 +17,6 @@ */ package org.l2jmobius.gameserver.model.actor.instance; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -1326,7 +1323,7 @@ public class PlayerInstance extends Creature int level = getSkillLevel(magicId); ActionFailed af = new ActionFailed(); sendPacket(af); - MagicSkillUser msu = new MagicSkillUser(this, target, magicId, level, skill.getSkillTime(), skill.getReuseDelay()); + MagicSkillUser msu = new MagicSkillUser(this, target, magicId, level, skill.getHitTime(), skill.getReuseDelay()); sendPacket(msu); broadcastPacket(msu); SetupGauge sg = new SetupGauge(0, skill.getSkillTime()); @@ -1339,8 +1336,9 @@ public class PlayerInstance extends Creature disableSkill(skill.getId(), true); _enableSkillTimer.schedule(new EnableSkill(skill.getId()), skill.getReuseDelay()); disableAllSkills(); - _enableAllSkillsTimer.schedule(new EnableAllSkills(skill), skill.getSkillTime()); - _magicUseTimer.schedule(new MagicUseTask(target, skill), skill.getSkillTime() - 300); + final int hittime = skill.getHitTime(); + _enableAllSkillsTimer.schedule(new EnableAllSkills(skill), hittime + 5); + _magicUseTimer.schedule(new MagicUseTask(target, skill), hittime); } } @@ -1348,7 +1346,7 @@ public class PlayerInstance extends Creature protected void reduceArrowCount() { ItemInstance arrows = getInventory().destroyItem(getInventory().getPaperdollObjectId(8), 1); - _log.info("arrow count:" + arrows.getCount()); + // _log.info("arrow count:" + arrows.getCount()); if (arrows.getCount() == 0) { getInventory().unEquipItemOnPaperdoll(8); @@ -1413,7 +1411,7 @@ public class PlayerInstance extends Creature return System.currentTimeMillis() - _uptime; } - public void onMagicUseTimer(Creature target, Skill skill) throws IOException + public void onMagicUseTimer(Creature target, Skill skill) { if ((getCurrentState() == 2) && _allSkillsDisabled && isSkillDisabled(skill.getId()) && (getSkill() == skill)) { @@ -1425,7 +1423,7 @@ public class PlayerInstance extends Creature while (it.hasNext()) { PlayerInstance player = it.next(); - _log.fine("msl: " + getName() + " " + magicId + " " + level + " " + player.getName()); + // _log.fine("msl: " + getName() + " " + magicId + " " + level + " " + player.getName()); MagicSkillLaunched msl = new MagicSkillLaunched(this, magicId, level, player); sendPacket(msl); broadcastPacket(msl); @@ -1434,7 +1432,7 @@ public class PlayerInstance extends Creature else { MagicSkillLaunched msl = new MagicSkillLaunched(this, magicId, level, target); - _log.fine("msl: " + getName() + " " + magicId + " " + level + " " + target.getName()); + // _log.fine("msl: " + getName() + " " + magicId + " " + level + " " + target.getName()); sendPacket(msl); broadcastPacket(msl); } @@ -1602,12 +1600,9 @@ public class PlayerInstance extends Creature { onMagicUseTimer(_target, _skill); } - catch (Throwable e) + catch (Exception e) { - StringWriter pw = new StringWriter(); - PrintWriter prw = new PrintWriter(pw); - e.printStackTrace(prw); - _log.severe(pw.toString()); + e.printStackTrace(); } } }