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

Sync with L2jServer HighFive Oct 22nd 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-10-23 22:36:15 +00:00
parent ad889659fa
commit d49a007f9d
44 changed files with 1636 additions and 1117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@ -26,6 +26,7 @@ import java.util.StringTokenizer;
import com.l2jserver.Config;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@ -160,47 +161,39 @@ public class AdminBuffs implements IAdminCommandHandler
StringTokenizer st = new StringTokenizer(command, " ");
command = st.nextToken();
L2PcInstance player = null;
L2Character creature = null;
if (st.hasMoreTokens())
{
String playername = st.nextToken();
try
creature = L2World.getInstance().getPlayer(st.nextToken());
if (creature == null)
{
player = L2World.getInstance().getPlayer(playername);
}
catch (Exception e)
{
}
if (player == null)
{
activeChar.sendMessage("The player " + playername + " is not online.");
activeChar.sendMessage("The player " + creature + " is not online.");
return false;
}
}
else if ((activeChar.getTarget() != null) && activeChar.getTarget().isPlayer())
{
player = activeChar.getTarget().getActingPlayer();
}
else
{
activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return false;
final L2Object target = activeChar.getTarget();
if ((target != null) && target.isCharacter())
{
creature = (L2Character) target;
}
if (creature == null)
{
activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
return false;
}
}
try
creature.resetTimeStamps();
creature.resetDisabledSkills();
if (creature.isPlayer())
{
player.resetTimeStamps();
player.resetDisabledSkills();
player.sendPacket(new SkillCoolTime(player));
activeChar.sendMessage("Skill reuse was removed from " + player.getName() + ".");
return true;
}
catch (NullPointerException e)
{
return false;
creature.sendPacket(new SkillCoolTime(creature.getActingPlayer()));
}
activeChar.sendMessage("Skill reuse was removed from " + creature.getName() + ".");
return true;
}
else if (command.startsWith("admin_switch_gm_buffs"))
{
@ -384,4 +377,4 @@ public class AdminBuffs implements IAdminCommandHandler
}
}
}
}
}

2
trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java vendored
View File

@ -68,7 +68,7 @@ public final class MagicalAttackMp extends AbstractEffect
@Override
public L2EffectType getEffectType()
{
return L2EffectType.MAGICAL_ATTACK;
return L2EffectType.MAGICAL_ATTACK_MP;
}
@Override