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

Sync with L2JServer Jan 12th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-13 09:50:20 +00:00
parent a868d961a3
commit 0a44ad683c
1158 changed files with 59729 additions and 58627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@ -46,7 +46,6 @@ import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.network.L2GameClient;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.ExVoteSystemInfo;
import com.l2jserver.gameserver.network.serverpackets.GMViewItemList;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
@ -235,7 +234,6 @@ public class AdminEditChar implements IAdminCommandHandler
player.setPkKills(pk);
player.broadcastUserInfo();
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));
player.sendMessage("A GM changed your PK count to " + pk);
activeChar.sendMessage(player.getName() + "'s PK count changed to " + pk);
}
@ -266,7 +264,6 @@ public class AdminEditChar implements IAdminCommandHandler
player.setPvpKills(pvp);
player.broadcastUserInfo();
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));
player.sendMessage("A GM changed your PVP count to " + pvp);
activeChar.sendMessage(player.getName() + "'s PVP count changed to " + pvp);
}
@ -297,7 +294,6 @@ public class AdminEditChar implements IAdminCommandHandler
player.setFame(fame);
player.broadcastUserInfo();
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));
player.sendMessage("A GM changed your Reputation points to " + fame);
activeChar.sendMessage(player.getName() + "'s Fame changed to " + fame);
}
@ -328,7 +324,6 @@ public class AdminEditChar implements IAdminCommandHandler
player.setRecomHave(recVal);
player.broadcastUserInfo();
player.sendPacket(new UserInfo(player));
player.sendPacket(new ExBrExtraUserInfo(player));
player.sendPacket(new ExVoteSystemInfo(player));
player.sendMessage("A GM changed your Recommend points to " + recVal);
activeChar.sendMessage(player.getName() + "'s Recommend changed to " + recVal);

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

@ -36,10 +36,10 @@ import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CharInfo;
import com.l2jserver.gameserver.network.serverpackets.Earthquake;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.ExRedSky;
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SunRise;
@ -89,8 +89,6 @@ public class AdminEffects implements IAdminCommandHandler
"admin_effect",
"admin_effect_menu",
"admin_ave_abnormal",
"admin_ave_special",
"admin_ave_event",
"admin_social_menu",
"admin_play_sounds",
"admin_play_sound",
@ -221,7 +219,7 @@ public class AdminEffects implements IAdminCommandHandler
{
if (!player.isGM())
{
player.startAbnormalVisualEffect(true, AbnormalVisualEffect.PARALYZE);
player.startAbnormalVisualEffect(AbnormalVisualEffect.PARALYZE);
player.setIsParalyzed(true);
player.startParalyze();
}
@ -238,7 +236,7 @@ public class AdminEffects implements IAdminCommandHandler
Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
for (L2PcInstance player : plrs)
{
player.stopAbnormalVisualEffect(true, AbnormalVisualEffect.PARALYZE);
player.stopAbnormalVisualEffect(AbnormalVisualEffect.PARALYZE);
player.setIsParalyzed(false);
}
}
@ -265,11 +263,11 @@ public class AdminEffects implements IAdminCommandHandler
player = (L2Character) target;
if (type.equals("1"))
{
player.startAbnormalVisualEffect(true, AbnormalVisualEffect.PARALYZE);
player.startAbnormalVisualEffect(AbnormalVisualEffect.PARALYZE);
}
else
{
player.startAbnormalVisualEffect(true, AbnormalVisualEffect.FLESH_STONE);
player.startAbnormalVisualEffect(AbnormalVisualEffect.FLESH_STONE);
}
player.setIsParalyzed(true);
player.startParalyze();
@ -298,11 +296,11 @@ public class AdminEffects implements IAdminCommandHandler
player = (L2Character) target;
if (type.equals("1"))
{
player.stopAbnormalVisualEffect(true, AbnormalVisualEffect.PARALYZE);
player.stopAbnormalVisualEffect(AbnormalVisualEffect.PARALYZE);
}
else
{
player.stopAbnormalVisualEffect(true, AbnormalVisualEffect.FLESH_STONE);
player.stopAbnormalVisualEffect(AbnormalVisualEffect.FLESH_STONE);
}
player.setIsParalyzed(false);
}
@ -320,7 +318,7 @@ public class AdminEffects implements IAdminCommandHandler
if (target instanceof L2Character)
{
player = (L2Character) target;
player.startAbnormalVisualEffect(true, AbnormalVisualEffect.BIG_HEAD);
player.startAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD);
}
}
catch (Exception e)
@ -336,7 +334,7 @@ public class AdminEffects implements IAdminCommandHandler
if (target instanceof L2Character)
{
player = (L2Character) target;
player.stopAbnormalVisualEffect(true, AbnormalVisualEffect.BIG_HEAD);
player.stopAbnormalVisualEffect(AbnormalVisualEffect.BIG_HEAD);
}
}
catch (Exception e)
@ -377,7 +375,6 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.broadcastPacket(info1);
UserInfo info2 = new UserInfo(activeChar);
activeChar.sendPacket(info2);
activeChar.broadcastPacket(new ExBrExtraUserInfo(activeChar));
}
catch (Exception e)
{
@ -393,7 +390,6 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.broadcastPacket(info1);
UserInfo info2 = new UserInfo(activeChar);
activeChar.sendPacket(info2);
activeChar.broadcastPacket(new ExBrExtraUserInfo(activeChar));
}
else if (command.equals("admin_clearteams"))
{
@ -526,7 +522,7 @@ public class AdminEffects implements IAdminCommandHandler
}
}
}
else if (command.startsWith("admin_ave_abnormal") || command.startsWith("admin_ave_special") || command.startsWith("admin_ave_event"))
else if (command.startsWith("admin_ave_abnormal"))
{
if (st.countTokens() > 0)
{
@ -580,7 +576,18 @@ public class AdminEffects implements IAdminCommandHandler
}
else
{
final StringBuilder sb = new StringBuilder();
for (int i = 0; i < AbnormalVisualEffect.values().length; i++)
{
final AbnormalVisualEffect abnormalVisualEffect = AbnormalVisualEffect.values()[i];
sb.append("<button action=\"bypass admin_ave_abnormal " + abnormalVisualEffect.name() + "\" align=left icon=teleport>" + abnormalVisualEffect.name() + "</button>");
}
final NpcHtmlMessage html = new NpcHtmlMessage(0, 1);
html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/ave_abnormal.htm");
html.replace("%abnormals%", sb.toString());
activeChar.sendPacket(html);
activeChar.sendMessage("Usage: //" + command.replace("admin_", "") + " <AbnormalVisualEffect> [radius]");
return true;
}
}
else if (command.startsWith("admin_effect"))
@ -640,7 +647,7 @@ public class AdminEffects implements IAdminCommandHandler
}
}
if (command.contains("menu") || command.contains("ave_"))
if (command.contains("menu"))
{
showMainPage(activeChar, command);
}
@ -657,13 +664,13 @@ public class AdminEffects implements IAdminCommandHandler
if (target instanceof L2Character)
{
final L2Character character = (L2Character) target;
if (character.hasAbnormalVisualEffect(ave))
if (!character.hasAbnormalVisualEffect(ave))
{
character.stopAbnormalVisualEffect(true, ave);
character.startAbnormalVisualEffect(ave);
}
else
{
character.startAbnormalVisualEffect(true, ave);
character.stopAbnormalVisualEffect(ave);
}
return true;
}
@ -764,19 +771,7 @@ public class AdminEffects implements IAdminCommandHandler
private void showMainPage(L2PcInstance activeChar, String command)
{
String filename = "effects_menu";
if (command.contains("ave_abnormal"))
{
filename = "ave_abnormal";
}
else if (command.contains("ave_special"))
{
filename = "ave_special";
}
else if (command.contains("ave_event"))
{
filename = "ave_event";
}
else if (command.contains("social"))
if (command.contains("social"))
{
filename = "social";
}

2
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java vendored
View File

@ -28,7 +28,6 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.CharInfo;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
@ -218,7 +217,6 @@ public class AdminEnchant implements IAdminCommandHandler
player.sendPacket(iu);
player.broadcastPacket(new CharInfo(player));
player.sendPacket(new UserInfo(player));
player.broadcastPacket(new ExBrExtraUserInfo(player));
// informations
activeChar.sendMessage("Changed enchantment of " + player.getName() + "'s " + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + ".");

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java vendored
View File

@ -37,7 +37,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.L2Event;
import com.l2jserver.gameserver.model.entity.L2Event.EventState;
import com.l2jserver.gameserver.network.serverpackets.CharInfo;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
@ -331,7 +330,6 @@ public class AdminEventEngine implements IAdminCommandHandler
player.broadcastPacket(info1);
UserInfo info2 = new UserInfo(player);
player.sendPacket(info2);
player.broadcastPacket(new ExBrExtraUserInfo(player));
}
showEventControl(activeChar);
}
@ -348,7 +346,6 @@ public class AdminEventEngine implements IAdminCommandHandler
player.broadcastPacket(info1);
UserInfo info2 = new UserInfo(player);
player.sendPacket(info2);
player.broadcastPacket(new ExBrExtraUserInfo(player));
}
}
showEventControl(activeChar);

18
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java vendored
View File

@ -61,6 +61,7 @@ public class AdminTeleport implements IAdminCommandHandler
"admin_show_teleport",
"admin_teleport_to_character",
"admin_teleportto",
"admin_teleport",
"admin_move_to",
"admin_teleport_character",
"admin_recall",
@ -184,6 +185,23 @@ public class AdminTeleport implements IAdminCommandHandler
{
}
}
else if (command.startsWith("admin_teleport"))
{
try
{
final StringTokenizer st = new StringTokenizer(command, " ");
st.nextToken();
final int x = (int) Float.parseFloat(st.nextToken());
final int y = (int) Float.parseFloat(st.nextToken());
final int z = (int) Float.parseFloat(st.nextToken());
activeChar.teleToLocation(x, y, z);
}
catch (Exception e)
{
activeChar.sendMessage("Wrong coordinates!");
}
}
else if (command.startsWith("admin_recall "))
{
try