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

Sync with L2JServer Feb 7th 2015.

Browse Source
This commit is contained in:
mobius
2015-02-07 23:48:56 +00:00
parent 1e166ca657
commit ecd17fdefb
1949 changed files with 3120 additions and 33466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java vendored
View File

@ -25,6 +25,7 @@ import javolution.text.TextBuilder;
import com.l2jserver.Config;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.enums.ChatType;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2World;
@ -32,7 +33,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Hero;
import com.l2jserver.gameserver.model.olympiad.Olympiad;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
import com.l2jserver.gameserver.network.serverpackets.ExWorldChatCnt;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
@ -311,7 +311,7 @@ public class AdminAdmin implements IAdminCommandHandler
sb.append(" ");
}
final CreatureSay cs = new CreatureSay(activeChar, Say2.GLOBAL, sb.toString());
final CreatureSay cs = new CreatureSay(activeChar, ChatType.GLOBAL, sb.toString());
L2World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo);
break;
}

6
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@ -681,19 +681,19 @@ public class AdminEffects implements IAdminCommandHandler
{
try
{
if (target instanceof L2Character)
if (target.isCharacter())
{
if (target instanceof L2ChestInstance)
{
activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;
}
if ((target instanceof L2Npc) && ((action < 1) || (action > 3)))
if ((target.isNpc()) && ((action < 1) || (action > 20)))
{
activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;
}
if ((target instanceof L2PcInstance) && ((action < 2) || ((action > 18) && (action != SocialAction.LEVEL_UP))))
if ((target.isPlayer()) && ((action < 2) || ((action > 18) && (action != SocialAction.LEVEL_UP))))
{
activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java vendored
View File

@ -19,12 +19,12 @@
package handlers.admincommandhandlers;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.enums.ChatType;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
/**
@ -115,7 +115,7 @@ public class AdminGmChat implements IAdminCommandHandler
offset = 13;
}
text = command.substring(offset);
CreatureSay cs = new CreatureSay(0, Say2.ALLIANCE, activeChar.getName(), text);
CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text);
AdminData.getInstance().broadcastToGMs(cs);
}
catch (StringIndexOutOfBoundsException e)

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java vendored
View File

@ -18,13 +18,13 @@
*/
package handlers.admincommandhandlers;
import com.l2jserver.gameserver.enums.ChatType;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
/**
@ -54,7 +54,7 @@ public class AdminTargetSay implements IAdminCommandHandler
final String message = command.substring(16);
final L2Character target = (L2Character) obj;
target.broadcastPacket(new CreatureSay(target.getObjectId(), (target.isPlayer() ? Say2.ALL : Say2.NPC_ALL), target.getName(), message));
target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message));
}
catch (StringIndexOutOfBoundsException e)
{