Sync with L2JServer Feb 3rd 2015.

This commit is contained in:
mobius
2015-02-03 21:11:57 +00:00
parent 9cf1a6d6e5
commit fe25f74122
169 changed files with 3379 additions and 5414 deletions

View File

@@ -639,7 +639,7 @@ public class AdminEffects implements IAdminCommandHandler
{
String type = st.nextToken();
int diplayeffect = Integer.parseInt(type);
npc.setDisplayEffect(diplayeffect);
npc.setState(diplayeffect);
}
catch (Exception e)
{

View File

@@ -155,7 +155,7 @@ public final class CallPc extends AbstractEffect
if (activeChar.getInstanceId() > 0)
{
Instance summonerInstance = InstanceManager.getInstance().getInstance(activeChar.getInstanceId());
if (!Config.ALLOW_SUMMON_TO_INSTANCE || !summonerInstance.isSummonAllowed())
if (!Config.ALLOW_SUMMON_IN_INSTANCE || !summonerInstance.isSummonAllowed())
{
activeChar.sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_FROM_YOUR_CURRENT_LOCATION);
return false;