[Classic] Missing updates.

This commit is contained in:
MobiusDev
2015-05-22 04:38:57 +00:00
parent 13e5560585
commit 95c8b1345c
9 changed files with 97 additions and 12 deletions

View File

@@ -109,6 +109,7 @@ import handlers.admincommandhandlers.AdminTvTEvent;
import handlers.admincommandhandlers.AdminUnblockIp;
import handlers.admincommandhandlers.AdminVitality;
import handlers.admincommandhandlers.AdminZone;
import handlers.bypasshandlers.AlternateClassMaster;
import handlers.bypasshandlers.ArcanCityMovie;
import handlers.bypasshandlers.Augment;
import handlers.bypasshandlers.Buy;
@@ -243,6 +244,7 @@ import handlers.usercommandhandlers.ChannelLeave;
import handlers.usercommandhandlers.ClanPenalty;
import handlers.usercommandhandlers.ClanWarsList;
import handlers.usercommandhandlers.Dismount;
import handlers.usercommandhandlers.ExperienceGain;
import handlers.usercommandhandlers.InstanceZone;
import handlers.usercommandhandlers.Loc;
import handlers.usercommandhandlers.Mount;
@@ -411,6 +413,7 @@ public class MasterHandler
},
{
// Bypass Handlers
AlternateClassMaster.class,
ArcanCityMovie.class,
Augment.class,
Buy.class,
@@ -515,6 +518,7 @@ public class MasterHandler
ClanPenalty.class,
ClanWarsList.class,
Dismount.class,
ExperienceGain.class,
Unstuck.class,
InstanceZone.class,
Loc.class,

View File

@@ -72,7 +72,7 @@ public class L2PcInstanceAction implements IActionHandler
// Aggression target lock effect
if (activeChar.isLockedTarget() && (activeChar.getLockedTarget() != target))
{
activeChar.sendPacket(SystemMessageId.FAILED_CHANGE_TARGET);
activeChar.sendPacket(SystemMessageId.FAILED_TO_CHANGE_ENMITY);
return false;
}

View File

@@ -0,0 +1,48 @@
/*
* Copyright (C) 2004-2015 L2J DataPack
*
* This file is part of L2J DataPack.
*
* L2J DataPack is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* L2J DataPack is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.bypasshandlers;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2ClassMasterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* @author Mobius
*/
public class AlternateClassMaster implements IBypassHandler
{
private static final String[] COMMANDS =
{
"AlternateClassMaster",
};
@Override
public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
{
L2ClassMasterInstance.onTutorialLink(activeChar, command);
return false;
}
@Override
public String[] getBypassList()
{
return COMMANDS;
}
}

View File

@@ -93,7 +93,7 @@ public final class Fishing extends AbstractEffect
}
else
{
player.endFishing(false);
player.endFishing(false, false);
}
player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED);

View File

@@ -0,0 +1,74 @@
/*
* Copyright (C) 2004-2015 L2J DataPack
*
* This file is part of L2J DataPack.
*
* L2J DataPack is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* L2J DataPack is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.usercommandhandlers;
import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.events.EventType;
import com.l2jserver.gameserver.model.events.impl.character.playable.OnPlayableExpChanged;
import com.l2jserver.gameserver.model.events.listeners.FunctionEventListener;
import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
/**
* @author xban1x
*/
public final class ExperienceGain implements IVoicedCommandHandler
{
private final String[] COMMANDS = new String[]
{
"expoff",
"expon",
};
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (command.equals("expoff"))
{
if (!activeChar.getVariables().getBoolean("EXPOFF", false))
{
activeChar.addListener(new FunctionEventListener(activeChar, EventType.ON_PLAYABLE_EXP_CHANGED, (OnPlayableExpChanged event) -> onExperienceReceived(event.getActiveChar(), event.getNewExp() - event.getOldExp()), this));
activeChar.getVariables().set("EXPOFF", true);
activeChar.sendMessage("Experience gain is disabled.");
}
}
else if (command.equals("expon"))
{
if (activeChar.getVariables().getBoolean("EXPOFF", false))
{
activeChar.removeListenerIf(EventType.ON_PLAYABLE_EXP_CHANGED, listener -> listener.getOwner() == this);
activeChar.getVariables().set("EXPOFF", false);
activeChar.sendMessage("Experience gain is enabled.");
}
}
return true;
}
public TerminateReturn onExperienceReceived(L2Playable playable, long exp)
{
return new TerminateReturn(true, true, true);
}
@Override
public String[] getVoicedCommandList()
{
return COMMANDS;
}
}