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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,16 +287,11 @@ public class AdminAdmin implements IAdminCommandHandler
showConfigPage(activeChar);
}
}
else if (command.startsWith("admin_gmon"))
{
// nothing
}
else if (command.startsWith("admin_worldchat"))
{
final StringTokenizer st = new StringTokenizer(command);
st.nextToken(); // admin_worldchat
final String subCmd = st.hasMoreTokens() ? st.nextToken() : "";
switch (subCmd)
switch (st.hasMoreTokens() ? st.nextToken() : "")
{
case "shout":
{
@@ -372,6 +367,10 @@ public class AdminAdmin implements IAdminCommandHandler
}
}
}
else if (command.startsWith("admin_gmon"))
{
// nothing
}
return true;
}

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

@@ -83,8 +83,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
}
case "admin_announces":
{
final String subCmd = st.hasMoreTokens() ? st.nextToken() : "";
switch (subCmd)
switch (st.hasMoreTokens() ? st.nextToken() : "")
{
case "add":
{

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

@@ -138,9 +138,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
try
{
final String val = command.substring(22);
final int page = Integer.parseInt(val);
listCharacters(activeChar, page);
listCharacters(activeChar, Integer.parseInt(command.substring(22)));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -152,8 +150,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
try
{
final String val = command.substring(21);
findCharacter(activeChar, val);
findCharacter(activeChar, command.substring(21));
}
catch (StringIndexOutOfBoundsException e)
{ // Case of empty character name
@@ -165,8 +162,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
try
{
final String val = command.substring(14);
findCharactersPerIp(activeChar, val);
findCharactersPerIp(activeChar, command.substring(14));
}
catch (Exception e)
{ // Case of empty or malformed IP number
@@ -178,8 +174,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
findCharactersPerAccount(activeChar, val);
findCharactersPerAccount(activeChar, command.substring(19));
}
catch (Exception e)
{ // Case of empty or malformed player name
@@ -212,9 +207,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
try
{
final String val = command.substring(15);
final int karma = Integer.parseInt(val);
setTargetKarma(activeChar, karma);
setTargetKarma(activeChar, Integer.parseInt(command.substring(15)));
}
catch (Exception e)
{
@@ -570,9 +563,7 @@ public class AdminEditChar implements IAdminCommandHandler
final boolean changeCreateExpiryTime = st.nextToken().equalsIgnoreCase("create");
final String playerName = st.nextToken();
L2PcInstance player = null;
player = L2World.getInstance().getPlayer(playerName);
final L2PcInstance player = L2World.getInstance().getPlayer(playerName);
if (player == null)
{
final String updateQuery = "UPDATE characters SET " + (changeCreateExpiryTime ? "clan_create_expiry_time" : "clan_join_expiry_time") + " WHERE char_name=? LIMIT 1";
@@ -751,9 +742,7 @@ public class AdminEditChar implements IAdminCommandHandler
L2Object target;
try
{
final String val = command.substring(19);
final int objId = Integer.parseInt(val);
target = L2World.getInstance().getPet(objId);
target = L2World.getInstance().getPet(Integer.parseInt(command.substring(19)));
}
catch (Exception e)
{
@@ -888,8 +877,7 @@ public class AdminEditChar implements IAdminCommandHandler
activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
final L2Playable playable = ((L2Playable) target);
playable.updatePvPFlag(Math.abs(playable.getPvpFlag() - 1));
((L2Playable) target).updatePvPFlag(Math.abs(((L2Playable) target).getPvpFlag() - 1));
}
catch (Exception e)
{
@@ -1079,8 +1067,7 @@ public class AdminEditChar implements IAdminCommandHandler
if (target instanceof L2PcInstance)
{
final L2PcInstance player = (L2PcInstance) target;
gatherCharacterInfo(activeChar, player, "charedit.htm");
gatherCharacterInfo(activeChar, ((L2PcInstance) target), "charedit.htm");
}
}
@@ -1378,8 +1365,7 @@ public class AdminEditChar implements IAdminCommandHandler
public int hashCode()
{
final int prime = 31;
int result = 1;
result = (prime * result) + ((ip == null) ? 0 : ip.hashCode());
int result = (prime * 1) + ((ip == null) ? 0 : ip.hashCode());
for (int[] array : tracert)
{
result = (prime * result) + Arrays.hashCode(array);
@@ -1455,8 +1441,7 @@ public class AdminEditChar implements IAdminCommandHandler
html.replace("%race%", target.getTemplate().getRace().toString());
if (target instanceof L2PetInstance)
{
final int objId = target.getActingPlayer().getObjectId();
html.replace("%inv%", " <a action=\"bypass admin_show_pet_inv " + objId + "\">view</a>");
html.replace("%inv%", " <a action=\"bypass admin_show_pet_inv " + target.getActingPlayer().getObjectId() + "\">view</a>");
}
else
{

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

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2ChestInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.CharInfo;
import com.l2jmobius.gameserver.network.serverpackets.Earthquake;
@@ -227,8 +226,7 @@ public class AdminEffects implements IAdminCommandHandler
{
try
{
final Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
for (L2PcInstance player : plrs)
for (L2PcInstance player : activeChar.getKnownList().getKnownPlayers().values())
{
if (!player.isGM())
{
@@ -246,8 +244,7 @@ public class AdminEffects implements IAdminCommandHandler
{
try
{
final Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
for (L2PcInstance player : plrs)
for (L2PcInstance player : activeChar.getKnownList().getKnownPlayers().values())
{
player.stopAbnormalVisualEffect(AbnormalVisualEffect.PARALYZE);
player.setIsParalyzed(false);
@@ -363,8 +360,7 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.stopSkillEffects((val == 0) && sendMessage, 7029);
if ((val >= 1) && (val <= 4))
{
final Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val);
activeChar.doSimultaneousCast(gmSpeedSkill);
activeChar.doSimultaneousCast(SkillData.getInstance().getSkill(7029, val));
}
}
catch (Exception e)
@@ -386,8 +382,7 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.teleToLocation(activeChar.getLocation());
final CharInfo info1 = new CharInfo(activeChar);
activeChar.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(activeChar);
activeChar.sendPacket(info2);
activeChar.sendPacket(new UserInfo(activeChar));
}
catch (Exception e)
{
@@ -401,15 +396,13 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.spawnMe(activeChar.getX(), activeChar.getY(), activeChar.getZ());
final CharInfo info1 = new CharInfo(activeChar);
activeChar.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(activeChar);
activeChar.sendPacket(info2);
activeChar.sendPacket(new UserInfo(activeChar));
}
else if (command.equals("admin_clearteams"))
{
try
{
final Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
for (L2PcInstance player : plrs)
for (L2PcInstance player : activeChar.getKnownList().getKnownPlayers().values())
{
player.setTeam(Team.NONE);
player.broadcastUserInfo();
@@ -430,9 +423,7 @@ public class AdminEffects implements IAdminCommandHandler
radius = Integer.parseInt(st.nextToken());
}
final Team team = Team.valueOf(val.toUpperCase());
final Collection<L2Character> plrs = activeChar.getKnownList().getKnownCharactersInRadius(radius);
for (L2Character player : plrs)
for (L2Character player : activeChar.getKnownList().getKnownCharactersInRadius(radius))
{
player.setTeam(team);
}
@@ -648,9 +639,7 @@ public class AdminEffects implements IAdminCommandHandler
final L2Npc npc = (L2Npc) target;
try
{
final String type = st.nextToken();
final int diplayeffect = Integer.parseInt(type);
npc.setDisplayEffect(diplayeffect);
npc.setDisplayEffect(Integer.parseInt(st.nextToken()));
}
catch (Exception e)
{
@@ -709,8 +698,7 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;
}
final L2Character character = (L2Character) target;
character.broadcastPacket(new SocialAction(character.getObjectId(), action));
((L2Character) target).broadcastPacket(new SocialAction(((L2Character) target).getObjectId(), action));
}
else
{
@@ -781,11 +769,6 @@ public class AdminEffects implements IAdminCommandHandler
private void showMainPage(L2PcInstance activeChar, String command)
{
String filename = "effects_menu";
if (command.contains("social"))
{
filename = "social";
}
AdminHtml.showAdminHtml(activeChar, filename + ".htm");
AdminHtml.showAdminHtml(activeChar, (command.contains("social") ? "social" : "effects_menu") + ".htm");
}
}

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

@@ -321,8 +321,7 @@ public class AdminEventEngine implements IAdminCommandHandler
player.teleToLocation(player.getLocation(), true);
final CharInfo info1 = new CharInfo(player);
player.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(player);
player.sendPacket(info2);
player.sendPacket(new UserInfo(player));
}
showEventControl(activeChar);
}
@@ -337,8 +336,7 @@ public class AdminEventEngine implements IAdminCommandHandler
player.spawnMe(player.getX(), player.getY(), player.getZ());
final CharInfo info1 = new CharInfo(player);
player.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(player);
player.sendPacket(info2);
player.sendPacket(new UserInfo(player));
}
}
showEventControl(activeChar);

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

@@ -52,8 +52,7 @@ public class AdminExpSp implements IAdminCommandHandler
{
try
{
final String val = command.substring(16);
if (!adminAddExpSp(activeChar, val))
if (!adminAddExpSp(activeChar, command.substring(16)))
{
activeChar.sendMessage("Usage: //add_exp_sp exp sp");
}
@@ -67,8 +66,7 @@ public class AdminExpSp implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
if (!adminRemoveExpSP(activeChar, val))
if (!adminRemoveExpSP(activeChar, command.substring(19)))
{
activeChar.sendMessage("Usage: //remove_exp_sp exp sp");
}

12
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java vendored
View File

@@ -106,16 +106,8 @@ public class AdminFightCalculator implements IAdminCommandHandler
}
}
L2NpcTemplate npc1 = null;
if (mid1 != 0)
{
npc1 = NpcData.getInstance().getTemplate(mid1);
}
L2NpcTemplate npc2 = null;
if (mid2 != 0)
{
npc2 = NpcData.getInstance().getTemplate(mid2);
}
final L2NpcTemplate npc1 = mid1 != 0 ? NpcData.getInstance().getTemplate(mid1) : null;
final L2NpcTemplate npc2 = mid2 != 0 ? NpcData.getInstance().getTemplate(mid2) : null;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();

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

@@ -21,7 +21,6 @@ import java.util.StringTokenizer;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Fort;
@@ -124,8 +123,7 @@ public class AdminFortSiege implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_removefort"))
{
final L2Clan clan = fort.getOwnerClan();
if (clan != null)
if (fort.getOwnerClan() != null)
{
fort.removeOwner(true);
}
@@ -190,5 +188,4 @@ public class AdminFortSiege implements IAdminCommandHandler
{
return ADMIN_COMMANDS;
}
}

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

@@ -112,8 +112,7 @@ public class AdminGmChat implements IAdminCommandHandler
offset = 13;
}
text = command.substring(offset);
final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text);
AdminData.getInstance().broadcastToGMs(cs);
AdminData.getInstance().broadcastToGMs((new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text)));
}
catch (StringIndexOutOfBoundsException e)
{

7
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java vendored
View File

@@ -39,12 +39,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
final StringTokenizer st = new StringTokenizer(command, " ");
final String actualCommand = st.nextToken(); // Get actual command
String val = "";
if (st.countTokens() >= 1)
{
val = st.nextToken();
}
final String val = st.countTokens() >= 1 ? st.nextToken() : "";
if (actualCommand.equalsIgnoreCase("admin_kill_tiat"))
{
GraciaSeedsManager.getInstance().increaseSoDTiatKilled();

7
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java vendored
View File

@@ -68,8 +68,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
{
if (st.hasMoreTokens())
{
final int grandBossId = Integer.parseInt(st.nextToken());
manageHtml(activeChar, grandBossId);
manageHtml(activeChar, Integer.parseInt(st.nextToken()));
}
else
{
@@ -138,9 +137,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
{
if (st.hasMoreTokens())
{
final int grandBossId = Integer.parseInt(st.nextToken());
switch (grandBossId)
switch (Integer.parseInt(st.nextToken()))
{
case ANTHARAS:
{

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

@@ -50,8 +50,7 @@ public class AdminHeal implements IAdminCommandHandler
{
try
{
final String healTarget = command.substring(11);
handleHeal(activeChar, healTarget);
handleHeal(activeChar, command.substring(11));
}
catch (StringIndexOutOfBoundsException e)
{

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

@@ -96,8 +96,7 @@ public class AdminHtml implements IAdminCommandHandler
}
else
{
final File file = new File(Config.DATAPACK_ROOT, path);
content = HtmCache.getInstance().loadFile(file);
content = HtmCache.getInstance().loadFile((new File(Config.DATAPACK_ROOT, path)));
}
final NpcHtmlMessage html = new NpcHtmlMessage();
if (content != null)
@@ -116,5 +115,4 @@ public class AdminHtml implements IAdminCommandHandler
{
return ADMIN_COMMANDS;
}
}

7
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java vendored
View File

@@ -40,12 +40,7 @@ public class AdminLevel implements IAdminCommandHandler
final StringTokenizer st = new StringTokenizer(command, " ");
final String actualCommand = st.nextToken(); // Get actual command
String val = "";
if (st.countTokens() >= 1)
{
val = st.nextToken();
}
final String val = st.countTokens() >= 1 ? st.nextToken() : "";
if (actualCommand.equalsIgnoreCase("admin_add_level"))
{
try

10
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java vendored
View File

@@ -79,9 +79,7 @@ public class AdminMenu implements IAdminCommandHandler
{
try
{
final String targetName = command.substring(23);
final L2PcInstance player = L2World.getInstance().getPlayer(targetName);
teleportCharacter(player, activeChar.getLocation(), activeChar, "Admin is teleporting you.");
teleportCharacter(L2World.getInstance().getPlayer(command.substring(23)), activeChar.getLocation(), activeChar, "Admin is teleporting you.");
}
catch (StringIndexOutOfBoundsException e)
{
@@ -194,8 +192,7 @@ public class AdminMenu implements IAdminCommandHandler
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
return false;
}
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
ach.useAdminCommand(subCommand + command.substring(14), activeChar);
AdminCommandHandler.getInstance().getHandler(subCommand).useAdminCommand(subCommand + command.substring(14), activeChar);
}
showMainPage(activeChar);
}
@@ -211,8 +208,7 @@ public class AdminMenu implements IAdminCommandHandler
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
return false;
}
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
ach.useAdminCommand(subCommand + command.substring(16), activeChar);
AdminCommandHandler.getInstance().getHandler(subCommand).useAdminCommand(subCommand + command.substring(16), activeChar);
}
showMainPage(activeChar);
}

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

@@ -95,8 +95,7 @@ public class AdminMobGroup implements IAdminCommandHandler
{
if (activeChar.getTarget() instanceof L2Character)
{
final L2Character target = (L2Character) activeChar.getTarget();
attack(command, activeChar, target);
attack(command, activeChar, ((L2Character) activeChar.getTarget()));
}
}
else if (command.startsWith("admin_mobgroup_rnd"))
@@ -141,8 +140,7 @@ public class AdminMobGroup implements IAdminCommandHandler
*/
private void showMainPage(L2PcInstance activeChar, String command)
{
final String filename = "mobgroup.htm";
AdminHtml.showAdminHtml(activeChar, filename);
AdminHtml.showAdminHtml(activeChar, "mobgroup.htm");
}
private void returnToChar(String command, L2PcInstance activeChar)

12
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPCBangPoints.java vendored
View File

@@ -139,23 +139,17 @@ public final class AdminPCBangPoints implements IAdminCommandHandler
if (range <= 0)
{
final int count = increaseForAll(L2World.getInstance().getPlayers(), value);
activeChar.sendMessage("You increased PC point(s) of all online players (" + count + ") by " + value + ".");
activeChar.sendMessage("You increased PC point(s) of all online players (" + increaseForAll(L2World.getInstance().getPlayers(), value) + ") by " + value + ".");
}
else if (range > 0)
{
final int count = increaseForAll(activeChar.getKnownList().getKnownPlayers().values(), value);
activeChar.sendMessage("You increased PC point(s) of all players (" + count + ") in range " + range + " by " + value + ".");
activeChar.sendMessage("You increased PC point(s) of all players (" + increaseForAll(activeChar.getKnownList().getKnownPlayers().values(), value) + ") in range " + range + " by " + value + ".");
}
break;
}
}
showMenuHtml(activeChar);
}
else
{
showMenuHtml(activeChar);
}
showMenuHtml(activeChar);
}
return true;
}

79
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@@ -92,12 +92,7 @@ public final class AdminPForge implements IAdminCommandHandler
}
catch (Exception e)
{
if (i > 0)
{
return true;
}
return false;
return i > 0;
}
if (opCodeLong < 0)
@@ -430,14 +425,7 @@ public final class AdminPForge implements IAdminCommandHandler
case "$boid":
{
boat = activeChar.getBoat();
if (boat != null)
{
value = String.valueOf(boat.getObjectId());
}
else
{
value = "0";
}
value = boat != null ? String.valueOf(boat.getObjectId()) : "0";
break;
}
case "$title":
@@ -481,93 +469,44 @@ public final class AdminPForge implements IAdminCommandHandler
if ((target != null) && (target instanceof L2Playable))
{
boat = ((L2Playable) target).getActingPlayer().getBoat();
if (boat != null)
{
value = String.valueOf(boat.getObjectId());
}
else
{
value = "0";
}
value = boat != null ? String.valueOf(boat.getObjectId()) : "0";
}
break;
}
case "$ttitle":
{
target = activeChar.getTarget();
if ((target != null) && (target instanceof L2Character))
{
value = String.valueOf(((L2Character) target).getTitle());
}
else
{
value = "";
}
value = (target != null) && (target instanceof L2Character) ? String.valueOf(((L2Character) target).getTitle()) : "";
break;
}
case "$tname":
{
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getName());
}
else
{
value = "";
}
value = target != null ? String.valueOf(target.getName()) : "";
break;
}
case "$tx":
{
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getX());
}
else
{
value = "0";
}
value = target != null ? String.valueOf(target.getX()) : "0";
break;
}
case "$ty":
{
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getY());
}
else
{
value = "0";
}
value = target != null ? String.valueOf(target.getY()) : "0";
break;
}
case "$tz":
{
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getZ());
}
else
{
value = "0";
}
value = target != null ? String.valueOf(target.getZ()) : "0";
break;
}
case "$theading":
{
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getHeading());
}
else
{
value = "0";
}
value = target != null ? String.valueOf(target.getHeading()) : "0";
break;
}
}

1
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java vendored
View File

@@ -213,5 +213,4 @@ public class AdminPledge implements IAdminCommandHandler
{
AdminHtml.showAdminHtml(activeChar, "game_menu.htm");
}
}

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

@@ -164,8 +164,7 @@ public class AdminPolymorph implements IAdminCommandHandler
final L2Character Char = (L2Character) obj;
final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0);
Char.broadcastPacket(msk);
final SetupGauge sg = new SetupGauge(0, 4000);
Char.sendPacket(sg);
Char.sendPacket(new SetupGauge(0, 4000));
}
// end of animation
obj.decayMe();

23
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPremium.java vendored
View File

@@ -51,8 +51,7 @@ public class AdminPremium implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
addPremiumStatus(activeChar, 1, val);
addPremiumStatus(activeChar, 1, command.substring(19));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -63,8 +62,7 @@ public class AdminPremium implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
addPremiumStatus(activeChar, 2, val);
addPremiumStatus(activeChar, 2, command.substring(19));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -75,8 +73,7 @@ public class AdminPremium implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
addPremiumStatus(activeChar, 3, val);
addPremiumStatus(activeChar, 3, command.substring(19));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -87,8 +84,7 @@ public class AdminPremium implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
viewPremiumInfo(activeChar, val);
viewPremiumInfo(activeChar, command.substring(19));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -99,8 +95,7 @@ public class AdminPremium implements IAdminCommandHandler
{
try
{
final String val = command.substring(21);
removePremium(activeChar, val);
removePremium(activeChar, command.substring(21));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -124,18 +119,14 @@ public class AdminPremium implements IAdminCommandHandler
// TODO: Add check if account exists XD
PremiumManager.getInstance().updatePremiumData(months, accountName);
final SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
final long endDate = PremiumManager.getInstance().getPremiumEndDate(accountName);
admin.sendMessage("Account " + accountName + " will now have premium status until " + String.valueOf(format.format(endDate)) + ".");
admin.sendMessage("Account " + accountName + " will now have premium status until " + String.valueOf(new SimpleDateFormat("dd.MM.yyyy HH:mm").format(PremiumManager.getInstance().getPremiumEndDate(accountName))) + ".");
}
private void viewPremiumInfo(L2PcInstance admin, String accountName)
{
if (PremiumManager.getInstance().getPremiumEndDate(accountName) > 0)
{
final SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
final long endDate = PremiumManager.getInstance().getPremiumEndDate(accountName);
admin.sendMessage("Account " + accountName + " has premium status until " + String.valueOf(format.format(endDate)) + ".");
admin.sendMessage("Account " + accountName + " has premium status until " + String.valueOf(new SimpleDateFormat("dd.MM.yyyy HH:mm").format(PremiumManager.getInstance().getPremiumEndDate(accountName))) + ".");
}
else
{

12
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPrimePoints.java vendored
View File

@@ -123,23 +123,17 @@ public final class AdminPrimePoints implements IAdminCommandHandler
if (range <= 0)
{
final int count = increaseForAll(L2World.getInstance().getPlayers(), value);
activeChar.sendMessage("You increased NCoin(s) of all online players (" + count + ") by " + value + ".");
activeChar.sendMessage("You increased NCoin(s) of all online players (" + increaseForAll(L2World.getInstance().getPlayers(), value) + ") by " + value + ".");
}
else if (range > 0)
{
final int count = increaseForAll(activeChar.getKnownList().getKnownPlayers().values(), value);
activeChar.sendMessage("You increased NCoin(s) of all players (" + count + ") in range " + range + " by " + value + ".");
activeChar.sendMessage("You increased NCoin(s) of all players (" + increaseForAll(activeChar.getKnownList().getKnownPlayers().values(), value) + ") in range " + range + " by " + value + ".");
}
break;
}
}
showMenuHtml(activeChar);
}
else
{
showMenuHtml(activeChar);
}
showMenuHtml(activeChar);
}
return true;
}

9
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java vendored
View File

@@ -91,8 +91,7 @@ public class AdminPunishment implements IAdminCommandHandler
}
else
{
final String subcmd = st.nextToken();
switch (subcmd)
switch (st.nextToken())
{
case "info":
{
@@ -388,11 +387,7 @@ public class AdminPunishment implements IAdminCommandHandler
private static final String findCharId(String key)
{
final int charId = CharNameTable.getInstance().getIdByName(key);
if (charId > 0) // Yeah its a char name!
{
return Integer.toString(charId);
}
return key;
return charId > 0 ? Integer.toString(charId) : key;
}
@Override

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

@@ -76,8 +76,7 @@ public class AdminQuest implements IAdminCommandHandler
// try the first param as id
try
{
final int questId = Integer.parseInt(parts[1]);
if (QuestManager.getInstance().reload(questId))
if (QuestManager.getInstance().reload(Integer.parseInt(parts[1])))
{
activeChar.sendMessage("Quest Reloaded Successfully.");
}

1
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java vendored
View File

@@ -298,5 +298,4 @@ public class AdminReload implements IAdminCommandHandler
{
return ADMIN_COMMANDS;
}
}

1
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java vendored
View File

@@ -167,5 +167,4 @@ public class AdminRide implements IAdminCommandHandler
{
return ADMIN_COMMANDS;
}
}

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

@@ -92,9 +92,7 @@ public class AdminServerInfo implements IAdminCommandHandler
time -= TimeUnit.DAYS.toMillis(days);
final long hours = TimeUnit.MILLISECONDS.toHours(time);
time -= TimeUnit.HOURS.toMillis(hours);
final long minutes = TimeUnit.MILLISECONDS.toMinutes(time);
return days + " Days, " + hours + " Hours, " + minutes + " Minutes";
return days + " Days, " + hours + " Hours, " + TimeUnit.MILLISECONDS.toMinutes(time) + " Minutes";
}
private String buildTheardInfo(String category)

9
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java vendored
View File

@@ -94,13 +94,10 @@ public class AdminShowQuests implements IAdminCommandHandler
val[0] = "name";
val[1] = cmdParams[2];
}
if (cmdParams.length > 3)
if ((cmdParams.length > 3) && cmdParams[3].equals("custom"))
{
if (cmdParams[3].equals("custom"))
{
val[0] = "custom";
val[1] = cmdParams[2];
}
val[0] = "custom";
val[1] = cmdParams[2];
}
}
}

1
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java vendored
View File

@@ -125,5 +125,4 @@ public class AdminShutdown implements IAdminCommandHandler
{
Shutdown.getInstance().abort(activeChar);
}
}

37
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java vendored
View File

@@ -94,8 +94,7 @@ public class AdminSkill implements IAdminCommandHandler
{
try
{
final String val = command.substring(20);
removeSkillsPage(activeChar, Integer.parseInt(val));
removeSkillsPage(activeChar, Integer.parseInt(command.substring(20)));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -109,8 +108,7 @@ public class AdminSkill implements IAdminCommandHandler
{
try
{
final String val = command.substring(18);
AdminHtml.showAdminHtml(activeChar, "skills/" + val + ".htm");
AdminHtml.showAdminHtml(activeChar, "skills/" + command.substring(18) + ".htm");
}
catch (StringIndexOutOfBoundsException e)
{
@@ -120,8 +118,7 @@ public class AdminSkill implements IAdminCommandHandler
{
try
{
final String val = command.substring(15);
adminAddSkill(activeChar, val);
adminAddSkill(activeChar, command.substring(15));
}
catch (Exception e)
{
@@ -132,9 +129,7 @@ public class AdminSkill implements IAdminCommandHandler
{
try
{
final String id = command.substring(19);
final int idval = Integer.parseInt(id);
adminRemoveSkill(activeChar, idval);
adminRemoveSkill(activeChar, Integer.parseInt(command.substring(19)));
}
catch (Exception e)
{
@@ -308,19 +303,13 @@ public class AdminSkill implements IAdminCommandHandler
}
final int skillsStart = maxSkillsPerPage * page;
int skillsEnd = skills.length;
if ((skillsEnd - skillsStart) > maxSkillsPerPage)
{
skillsEnd = skillsStart + maxSkillsPerPage;
}
final int skillsEnd = (skills.length - skillsStart) > maxSkillsPerPage ? skillsStart + maxSkillsPerPage : skills.length;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final StringBuilder replyMSG = StringUtil.startAppend(500 + (maxPages * 50) + (((skillsEnd - skillsStart) + 1) * 50), "<html><body><table width=260><tr><td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td width=180><center>Character Selection Menu</center></td><td width=40><button value=\"Back\" action=\"bypass -h admin_show_skills\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table><br><br><center>Editing <font color=\"LEVEL\">", player.getName(), "</font></center><br><table width=270><tr><td>Lv: ", String.valueOf(player.getLevel()), " ", ClassListData.getInstance().getClass(player.getClassId()).getClientCode(), "</td></tr></table><br><table width=270><tr><td>Note: Dont forget that modifying players skills can</td></tr><tr><td>ruin the game...</td></tr></table><br><center>Click on the skill you wish to remove:</center><br><center><table width=270><tr>");
for (int x = 0; x < maxPages; x++)
{
final int pagenr = x + 1;
StringUtil.append(replyMSG, "<td><a action=\"bypass -h admin_remove_skills ", String.valueOf(x), "\">Page ", String.valueOf(pagenr), "</a></td>");
StringUtil.append(replyMSG, "<td><a action=\"bypass -h admin_remove_skills ", String.valueOf(x), "\">Page ", String.valueOf((x + 1)), "</a></td>");
}
replyMSG.append("</tr></table></center><br><table width=270><tr><td width=80>Name:</td><td width=60>Level:</td><td width=40>Id:</td></tr>");
@@ -448,20 +437,12 @@ public class AdminSkill implements IAdminCommandHandler
}
final L2PcInstance player = target.getActingPlayer();
final StringTokenizer st = new StringTokenizer(val);
if (st.countTokens() != 2)
{
showMainPage(activeChar);
}
else
if (st.countTokens() == 2)
{
Skill skill = null;
try
{
final String id = st.nextToken();
final String level = st.nextToken();
final int idval = Integer.parseInt(id);
final int levelval = Integer.parseInt(level);
skill = SkillData.getInstance().getSkill(idval, levelval);
skill = SkillData.getInstance().getSkill(Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()));
}
catch (Exception e)
{
@@ -486,8 +467,8 @@ public class AdminSkill implements IAdminCommandHandler
{
activeChar.sendMessage("Error: there is no such skill.");
}
showMainPage(activeChar); // Back to start
}
showMainPage(activeChar); // Back to start
}
/**

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

@@ -71,8 +71,7 @@ public class AdminSummon implements IAdminCommandHandler
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
return false;
}
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
AdminCommandHandler.getInstance().getHandler(subCommand).useAdminCommand(subCommand + " " + id + " " + count, activeChar);
}
else
{

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

@@ -140,8 +140,7 @@ public class AdminTeleport implements IAdminCommandHandler
{
try
{
final String val = command.substring(14);
teleportTo(activeChar, val);
teleportTo(activeChar, command.substring(14));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -158,9 +157,7 @@ public class AdminTeleport implements IAdminCommandHandler
{
try
{
final String val = command.substring(25);
teleportCharacter(activeChar, val);
teleportCharacter(activeChar, command.substring(25));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -173,9 +170,7 @@ public class AdminTeleport implements IAdminCommandHandler
{
try
{
final String targetName = command.substring(17);
final L2PcInstance player = L2World.getInstance().getPlayer(targetName);
teleportToCharacter(activeChar, player);
teleportToCharacter(activeChar, L2World.getInstance().getPlayer(command.substring(17)));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -646,5 +641,4 @@ public class AdminTeleport implements IAdminCommandHandler
activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
}
}
}

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

@@ -57,8 +57,7 @@ public class AdminVitality implements IAdminCommandHandler
if (activeChar.getTarget() instanceof L2PcInstance)
{
L2PcInstance target;
target = (L2PcInstance) activeChar.getTarget();
final L2PcInstance target = (L2PcInstance) activeChar.getTarget();
if (cmd.equals("admin_set_vitality"))
{

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

@@ -97,8 +97,7 @@ public class AdminZone implements IAdminCommandHandler
}
else
{
final int zoneId = Integer.parseInt(next);
ZoneManager.getInstance().getZoneById(zoneId).visualizeZone(activeChar.getZ());
ZoneManager.getInstance().getZoneById(Integer.parseInt(next)).visualizeZone(activeChar.getZ());
}
}
else if (actualCommand.equalsIgnoreCase("admin_zone_visual_clear"))