From 0077c221800174f955253db081690d65aaa5ba5b Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Mon, 6 Feb 2012 05:16:23 +0000
Subject: [PATCH] BETA: Voiced commands update, format and cleanup.
---
.../voicedcommandhandlers/Banking.java | 19 +--
.../voicedcommandhandlers/ChangePassword.java | 28 ++--
.../voicedcommandhandlers/ChatAdmin.java | 24 +--
.../handlers/voicedcommandhandlers/Debug.java | 14 +-
.../handlers/voicedcommandhandlers/Lang.java | 28 +---
.../voicedcommandhandlers/TvTVoicedInfo.java | 17 +-
.../voicedcommandhandlers/Wedding.java | 155 ++++++++++++------
.../voicedcommandhandlers/castle.java | 25 ++-
.../handlers/voicedcommandhandlers/set.java | 36 ++--
.../handlers/voicedcommandhandlers/stats.java | 63 ++++---
10 files changed, 226 insertions(+), 183 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java
index 5f069b113f..d6e79abdce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Banking.java
@@ -20,7 +20,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* This class trades Gold Bars for Adena and vice versa.
- *
* @author Ahmed
*/
public class Banking implements IVoicedCommandHandler
@@ -32,23 +31,21 @@ public class Banking implements IVoicedCommandHandler
"deposit"
};
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
- */
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
- if (command.equalsIgnoreCase("bank"))
+ if (command.equals("bank"))
{
activeChar.sendMessage(".deposit (" + Config.BANKING_SYSTEM_ADENA + " Adena = " + Config.BANKING_SYSTEM_GOLDBARS + " Goldbar) / .withdraw (" + Config.BANKING_SYSTEM_GOLDBARS + " Goldbar = " + Config.BANKING_SYSTEM_ADENA + " Adena)");
}
- else if (command.equalsIgnoreCase("deposit"))
+ else if (command.equals("deposit"))
{
if (activeChar.getInventory().getInventoryItemCount(57, 0) >= Config.BANKING_SYSTEM_ADENA)
{
if (!activeChar.reduceAdena("Goldbar", Config.BANKING_SYSTEM_ADENA, activeChar, false))
+ {
return false;
+ }
activeChar.getInventory().addItem("Goldbar", 3470, Config.BANKING_SYSTEM_GOLDBARS, activeChar, null);
activeChar.getInventory().updateDatabase();
activeChar.sendMessage("Thank you, you now have " + Config.BANKING_SYSTEM_GOLDBARS + " Goldbar(s), and " + Config.BANKING_SYSTEM_ADENA + " less adena.");
@@ -58,12 +55,14 @@ public class Banking implements IVoicedCommandHandler
activeChar.sendMessage("You do not have enough Adena to convert to Goldbar(s), you need " + Config.BANKING_SYSTEM_ADENA + " Adena.");
}
}
- else if (command.equalsIgnoreCase("withdraw"))
+ else if (command.equals("withdraw"))
{
if (activeChar.getInventory().getInventoryItemCount(3470, 0) >= Config.BANKING_SYSTEM_GOLDBARS)
{
if (!activeChar.destroyItemByItemId("Adena", 3470, Config.BANKING_SYSTEM_GOLDBARS, activeChar, false))
+ {
return false;
+ }
activeChar.getInventory().addAdena("Adena", Config.BANKING_SYSTEM_ADENA, activeChar, null);
activeChar.getInventory().updateDatabase();
activeChar.sendMessage("Thank you, you now have " + Config.BANKING_SYSTEM_ADENA + " Adena, and " + Config.BANKING_SYSTEM_GOLDBARS + " less Goldbar(s).");
@@ -76,10 +75,6 @@ public class Banking implements IVoicedCommandHandler
return true;
}
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
- */
@Override
public String[] getVoicedCommandList()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
index 9fa3a1d5ec..1ff37f68bc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
@@ -23,11 +23,8 @@ import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-
/**
- *
* @author Nik
- *
*/
public class ChangePassword implements IVoicedCommandHandler
{
@@ -41,15 +38,24 @@ public class ChangePassword implements IVoicedCommandHandler
{
if (target != null)
{
- StringTokenizer st = new StringTokenizer(target);
+ final StringTokenizer st = new StringTokenizer(target);
try
{
String curpass = null, newpass = null, repeatnewpass = null;
- if (st.hasMoreTokens()) curpass = st.nextToken();
- if (st.hasMoreTokens()) newpass = st.nextToken();
- if (st.hasMoreTokens()) repeatnewpass = st.nextToken();
+ if (st.hasMoreTokens())
+ {
+ curpass = st.nextToken();
+ }
+ if (st.hasMoreTokens())
+ {
+ newpass = st.nextToken();
+ }
+ if (st.hasMoreTokens())
+ {
+ repeatnewpass = st.nextToken();
+ }
- if (!(curpass == null || newpass == null || repeatnewpass == null))
+ if (!((curpass == null) || (newpass == null) || (repeatnewpass == null)))
{
if (!newpass.equals(repeatnewpass))
{
@@ -83,16 +89,18 @@ public class ChangePassword implements IVoicedCommandHandler
}
else
{
- //showHTML(activeChar);
+ // showHTML(activeChar);
String html = HtmCache.getInstance().getHtm("en", "data/html/mods/ChangePassword.htm");
if (html == null)
+ {
html = "<html><body><br><br><center><font color=LEVEL>404:</font> File Not Found</center></body></html>";
+ }
activeChar.sendPacket(new NpcHtmlMessage(1, html));
return true;
}
return true;
}
-
+
@Override
public String[] getVoicedCommandList()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
index b7007f606d..eb42ec0244 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/ChatAdmin.java
@@ -30,17 +30,15 @@ public class ChatAdmin implements IVoicedCommandHandler
"unbanchat"
};
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
- */
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
+ {
return false;
+ }
- if (command.equalsIgnoreCase(VOICED_COMMANDS[0])) // banchat
+ if (command.equals(VOICED_COMMANDS[0])) // banchat
{
if (params == null)
{
@@ -65,13 +63,15 @@ public class ChatAdmin implements IVoicedCommandHandler
}
}
if (length < 0)
+ {
length = 0;
+ }
int objId = CharNameTable.getInstance().getIdByName(name);
if (objId > 0)
{
L2PcInstance player = L2World.getInstance().getPlayer(objId);
- if (player == null || !player.isOnline())
+ if ((player == null) || !player.isOnline())
{
activeChar.sendMessage("Player not online !");
return false;
@@ -101,9 +101,13 @@ public class ChatAdmin implements IVoicedCommandHandler
player.sendMessage("Chat banned by moderator " + activeChar.getName());
if (length > 0)
+ {
activeChar.sendMessage("Player " + player.getName() + " chat banned for " + length + " minutes.");
+ }
else
+ {
activeChar.sendMessage("Player " + player.getName() + " chat banned forever.");
+ }
}
else
{
@@ -112,7 +116,7 @@ public class ChatAdmin implements IVoicedCommandHandler
}
}
}
- else if (command.equalsIgnoreCase(VOICED_COMMANDS[1])) //unbanchat
+ else if (command.equals(VOICED_COMMANDS[1])) // unbanchat
{
if (params == null)
{
@@ -128,7 +132,7 @@ public class ChatAdmin implements IVoicedCommandHandler
if (objId > 0)
{
L2PcInstance player = L2World.getInstance().getPlayer(objId);
- if (player == null || !player.isOnline())
+ if ((player == null) || !player.isOnline())
{
activeChar.sendMessage("Player not online !");
return false;
@@ -154,10 +158,6 @@ public class ChatAdmin implements IVoicedCommandHandler
return true;
}
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
- */
@Override
public String[] getVoicedCommandList()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
index 6765434498..8dea10343a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Debug.java
@@ -25,36 +25,30 @@ public class Debug implements IVoicedCommandHandler
"debug"
};
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
- */
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
+ {
return false;
+ }
if (VOICED_COMMANDS[0].equalsIgnoreCase(command))
{
if (activeChar.isDebug())
{
activeChar.setDebug(null);
- activeChar.sendMessage("Debugging disabled");
+ activeChar.sendMessage("Debugging disabled.");
}
else
{
activeChar.setDebug(activeChar);
- activeChar.sendMessage("Debugging enabled");
+ activeChar.sendMessage("Debugging enabled.");
}
}
return true;
}
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
- */
@Override
public String[] getVoicedCommandList()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
index fadb4bd086..2b192abee2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Lang.java
@@ -29,31 +29,21 @@ public class Lang implements IVoicedCommandHandler
"lang"
};
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
- */
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
- if (!Config.L2JMOD_MULTILANG_ENABLE
- || !Config.L2JMOD_MULTILANG_VOICED_ALLOW)
+ if (!Config.L2JMOD_MULTILANG_ENABLE || !Config.L2JMOD_MULTILANG_VOICED_ALLOW)
+ {
return false;
+ }
- NpcHtmlMessage msg = new NpcHtmlMessage(1);
-
+ final NpcHtmlMessage msg = new NpcHtmlMessage(1);
if (params == null)
{
final StringBuilder html = StringUtil.startAppend(100);
for (String lang : Config.L2JMOD_MULTILANG_ALLOWED)
{
- StringUtil.append(html,
- "<button value=\"",
- lang.toUpperCase(),
- "\" action=\"bypass -h voice .lang ",
- lang,
- "\" width=60 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"><br>"
- );
+ StringUtil.append(html, "<button value=\"", lang.toUpperCase(), "\" action=\"bypass -h voice .lang ", lang, "\" width=60 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"><br>");
}
msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/Lang/LanguageSelect.htm");
@@ -62,7 +52,7 @@ public class Lang implements IVoicedCommandHandler
return true;
}
- StringTokenizer st = new StringTokenizer(params);
+ final StringTokenizer st = new StringTokenizer(params);
if (st.hasMoreTokens())
{
final String lang = st.nextToken().trim();
@@ -74,15 +64,11 @@ public class Lang implements IVoicedCommandHandler
}
msg.setFile(activeChar.getHtmlPrefix(), "data/html/mods/Lang/Error.htm");
activeChar.sendPacket(msg);
+ return true;
}
-
return false;
}
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
- */
@Override
public String[] getVoicedCommandList()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
index 5234fa464a..1f84c38b75 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/TvTVoicedInfo.java
@@ -24,17 +24,18 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
/**
* Tvt info.
- *
* @author denser
*/
public class TvTVoicedInfo implements IVoicedCommandHandler
{
- private static final String[] _voicedCommands = { "tvt" };
+ private static final String[] _voicedCommands =
+ {
+ "tvt"
+ };
/**
- * Set this to false and recompile script if you dont want to use string cache.
- * This will decrease performance but will be more consistent against possible html editions during runtime
- * Recompiling the script will get the new html would be enough too [DrHouse]
+ * Set this to false and recompile script if you don't want to use string cache.<br>
+ * This will decrease performance but will be more consistent against possible html editions during runtime Recompiling the script will get the new html would be enough too [DrHouse]
*/
private static final boolean USE_STATIC_HTML = true;
private static final String HTML = HtmCache.getInstance().getHtm(null, "data/html/mods/TvTEvent/Status.htm");
@@ -42,13 +43,11 @@ public class TvTVoicedInfo implements IVoicedCommandHandler
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
{
- if (command.equalsIgnoreCase("tvt"))
+ if (command.equals("tvt"))
{
if (TvTEvent.isStarting() || TvTEvent.isStarted())
{
- String htmContent = (USE_STATIC_HTML && !HTML.isEmpty()) ? HTML :
- HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/TvTEvent/Status.htm");
-
+ String htmContent = (USE_STATIC_HTML && !HTML.isEmpty()) ? HTML : HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/mods/TvTEvent/Status.htm");
try
{
NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage(5);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
index 83c652b7ba..9e67dbc626 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java
@@ -12,9 +12,9 @@
* 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.voicedcommandhandlers;
+import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.logging.Level;
@@ -59,27 +59,34 @@ public class Wedding implements IVoicedCommandHandler
"gotolove"
};
- /**
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
- */
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (activeChar == null)
+ {
return false;
+ }
if (command.startsWith("engage"))
+ {
return engage(activeChar);
+ }
else if (command.startsWith("divorce"))
+ {
return divorce(activeChar);
+ }
else if (command.startsWith("gotolove"))
+ {
return goToLove(activeChar);
+ }
return false;
}
public boolean divorce(L2PcInstance activeChar)
{
if (activeChar.getPartnerId() == 0)
+ {
return false;
+ }
int _partnerId = activeChar.getPartnerId();
int _coupleId = activeChar.getCoupleId();
@@ -94,20 +101,28 @@ public class Wedding implements IVoicedCommandHandler
}
else
+ {
activeChar.sendMessage("You have broken up as a couple.");
+ }
final L2PcInstance partner = L2World.getInstance().getPlayer(_partnerId);
if (partner != null)
{
partner.setPartnerId(0);
if (partner.isMarried())
+ {
partner.sendMessage("Your spouse has decided to divorce you.");
+ }
else
+ {
partner.sendMessage("Your fiance has decided to break the engagement with you.");
+ }
// give adena
if (AdenaAmount > 0)
+ {
partner.addAdena("WEDDING", AdenaAmount, null, false);
+ }
}
CoupleManager.getInstance().deleteCouple(_coupleId);
return true;
@@ -137,12 +152,18 @@ public class Wedding implements IVoicedCommandHandler
int skillLevel = 1;
if (activeChar.getLevel() > 40)
+ {
skillLevel = 2;
+ }
if (activeChar.isMageClass())
+ {
skillId = 4362;
+ }
else
+ {
skillId = 4361;
+ }
final L2Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
if (activeChar.getFirstEffect(skill) == null)
@@ -162,22 +183,26 @@ public class Wedding implements IVoicedCommandHandler
activeChar.sendMessage("Is there something wrong with you, are you trying to go out with youself?");
return false;
}
- else if (ptarget.isMarried())
+
+ if (ptarget.isMarried())
{
activeChar.sendMessage("Player already married.");
return false;
}
- else if (ptarget.isEngageRequest())
+
+ if (ptarget.isEngageRequest())
{
activeChar.sendMessage("Player already asked by someone else.");
return false;
}
- else if (ptarget.getPartnerId() != 0)
+
+ if (ptarget.getPartnerId() != 0)
{
activeChar.sendMessage("Player already engaged with someone else.");
return false;
}
- else if (ptarget.getAppearance().getSex() == activeChar.getAppearance().getSex() && !Config.L2JMOD_WEDDING_SAMESEX)
+
+ if ((ptarget.getAppearance().getSex() == activeChar.getAppearance().getSex()) && !Config.L2JMOD_WEDDING_SAMESEX)
{
activeChar.sendMessage("Gay marriage is not allowed on this server!");
return false;
@@ -186,20 +211,20 @@ public class Wedding implements IVoicedCommandHandler
// check if target has player on friendlist
boolean FoundOnFriendList = false;
int objectId;
- java.sql.Connection con = null;
+ Connection con = null;
try
{
con = L2DatabaseFactory.getInstance().getConnection();
- PreparedStatement statement;
- statement = con.prepareStatement("SELECT friendId FROM character_friends WHERE charId=?");
+ final PreparedStatement statement = con.prepareStatement("SELECT friendId FROM character_friends WHERE charId=?");
statement.setInt(1, ptarget.getObjectId());
- ResultSet rset = statement.executeQuery();
-
+ final ResultSet rset = statement.executeQuery();
while (rset.next())
{
objectId = rset.getInt("friendId");
if (objectId == activeChar.getObjectId())
+ {
FoundOnFriendList = true;
+ }
}
statement.close();
}
@@ -232,79 +257,94 @@ public class Wedding implements IVoicedCommandHandler
activeChar.sendMessage("You're not married.");
return false;
}
- else if (activeChar.getPartnerId() == 0)
+
+ if (activeChar.getPartnerId() == 0)
{
activeChar.sendMessage("Couldn't find your fiance in the Database - Inform a Gamemaster.");
_log.severe("Married but couldn't find parter for " + activeChar.getName());
return false;
}
- else if (GrandBossManager.getInstance().getZone(activeChar) != null)
+
+ if (GrandBossManager.getInstance().getZone(activeChar) != null)
{
activeChar.sendMessage("You are inside a Boss Zone.");
return false;
}
- else if (activeChar.isCombatFlagEquipped())
+
+ if (activeChar.isCombatFlagEquipped())
{
activeChar.sendMessage("While you are holding a Combat Flag or Territory Ward you can't go to your love!");
return false;
}
- else if (activeChar.isCursedWeaponEquipped())
+
+ if (activeChar.isCursedWeaponEquipped())
{
activeChar.sendMessage("While you are holding a Cursed Weapon you can't go to your love!");
return false;
}
- else if (GrandBossManager.getInstance().getZone(activeChar) != null)
+
+ if (GrandBossManager.getInstance().getZone(activeChar) != null)
{
activeChar.sendMessage("You are inside a Boss Zone.");
return false;
}
- else if (activeChar.isInJail())
+
+ if (activeChar.isInJail())
{
activeChar.sendMessage("You are in Jail!");
return false;
}
- else if (activeChar.isInOlympiadMode())
+
+ if (activeChar.isInOlympiadMode())
{
activeChar.sendMessage("You are in the Olympiad now.");
return false;
}
- else if (L2Event.isParticipant(activeChar))
+
+ if (L2Event.isParticipant(activeChar))
{
activeChar.sendMessage("You are in an event.");
return false;
}
- else if (activeChar.isInDuel())
+
+ if (activeChar.isInDuel())
{
activeChar.sendMessage("You are in a duel!");
return false;
}
- else if (activeChar.inObserverMode())
+
+ if (activeChar.inObserverMode())
{
activeChar.sendMessage("You are in the observation.");
return false;
}
- else if (SiegeManager.getInstance().getSiege(activeChar) != null && SiegeManager.getInstance().getSiege(activeChar).getIsInProgress())
+
+ if ((SiegeManager.getInstance().getSiege(activeChar) != null) && SiegeManager.getInstance().getSiege(activeChar).getIsInProgress())
{
activeChar.sendMessage("You are in a siege, you cannot go to your partner.");
return false;
}
- else if (activeChar.isFestivalParticipant())
+
+ if (activeChar.isFestivalParticipant())
{
activeChar.sendMessage("You are in a festival.");
return false;
}
- else if (activeChar.isInParty() && activeChar.getParty().isInDimensionalRift())
+
+ if (activeChar.isInParty() && activeChar.getParty().isInDimensionalRift())
{
activeChar.sendMessage("You are in the dimensional rift.");
return false;
}
+
// Thanks nbd
- else if (!TvTEvent.onEscapeUse(activeChar.getObjectId()))
+ if (!TvTEvent.onEscapeUse(activeChar.getObjectId()))
{
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
return false;
}
- else if (activeChar.isInsideZone(L2Character.ZONE_NOSUMMONFRIEND))
+
+ if (activeChar.isInsideZone(L2Character.ZONE_NOSUMMONFRIEND))
{
activeChar.sendMessage("You are in area which blocks summoning.");
return false;
@@ -316,62 +356,74 @@ public class Wedding implements IVoicedCommandHandler
activeChar.sendMessage("Your partner is not online.");
return false;
}
- else if (activeChar.getInstanceId() != partner.getInstanceId())
+
+ if (activeChar.getInstanceId() != partner.getInstanceId())
{
activeChar.sendMessage("Your partner is in another World!");
return false;
}
- else if (partner.isInJail())
+
+ if (partner.isInJail())
{
activeChar.sendMessage("Your partner is in Jail.");
return false;
}
- else if (partner.isCursedWeaponEquipped())
+
+ if (partner.isCursedWeaponEquipped())
{
activeChar.sendMessage("Your partner is holding a Cursed Weapon and you can't go to your love!");
return false;
}
- else if (GrandBossManager.getInstance().getZone(partner) != null)
+
+ if (GrandBossManager.getInstance().getZone(partner) != null)
{
activeChar.sendMessage("Your partner is inside a Boss Zone.");
return false;
}
- else if (partner.isInOlympiadMode())
+
+ if (partner.isInOlympiadMode())
{
activeChar.sendMessage("Your partner is in the Olympiad now.");
return false;
}
- else if (L2Event.isParticipant(partner))
+
+ if (L2Event.isParticipant(partner))
{
activeChar.sendMessage("Your partner is in an event.");
return false;
}
- else if (partner.isInDuel())
+
+ if (partner.isInDuel())
{
activeChar.sendMessage("Your partner is in a duel.");
return false;
}
- else if (partner.isFestivalParticipant())
+
+ if (partner.isFestivalParticipant())
{
activeChar.sendMessage("Your partner is in a festival.");
return false;
}
- else if (partner.isInParty() && partner.getParty().isInDimensionalRift())
+
+ if (partner.isInParty() && partner.getParty().isInDimensionalRift())
{
activeChar.sendMessage("Your partner is in dimensional rift.");
return false;
}
- else if (partner.inObserverMode())
+
+ if (partner.inObserverMode())
{
activeChar.sendMessage("Your partner is in the observation.");
return false;
}
- else if (SiegeManager.getInstance().getSiege(partner) != null && SiegeManager.getInstance().getSiege(partner).getIsInProgress())
+
+ if ((SiegeManager.getInstance().getSiege(partner) != null) && SiegeManager.getInstance().getSiege(partner).getIsInProgress())
{
activeChar.sendMessage("Your partner is in a siege, you cannot go to your partner.");
return false;
}
- else if (partner.isIn7sDungeon() && !activeChar.isIn7sDungeon())
+
+ if (partner.isIn7sDungeon() && !activeChar.isIn7sDungeon())
{
final int playerCabal = SevenSigns.getInstance().getPlayerCabal(activeChar.getObjectId());
final boolean isSealValidationPeriod = SevenSigns.getInstance().isSealValidationPeriod();
@@ -394,36 +446,38 @@ public class Wedding implements IVoicedCommandHandler
}
}
}
- else if (!TvTEvent.onEscapeUse(partner.getObjectId()))
+
+ if (!TvTEvent.onEscapeUse(partner.getObjectId()))
{
activeChar.sendMessage("Your partner is in an event.");
return false;
}
- else if (partner.isInsideZone(L2Character.ZONE_NOSUMMONFRIEND))
+
+ if (partner.isInsideZone(L2Character.ZONE_NOSUMMONFRIEND))
{
activeChar.sendMessage("Your partner is in area which blocks summoning.");
return false;
}
final int teleportTimer = Config.L2JMOD_WEDDING_TELEPORT_DURATION * 1000;
- activeChar.sendMessage("After " + teleportTimer / 60000 + " min. you will be teleported to your partner.");
+ activeChar.sendMessage("After " + (teleportTimer / 60000) + " min. you will be teleported to your partner.");
activeChar.getInventory().reduceAdena("Wedding", Config.L2JMOD_WEDDING_TELEPORT_PRICE, activeChar, null);
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
- //SoE Animation section
+ // SoE Animation section
activeChar.setTarget(activeChar);
activeChar.disableAllSkills();
final MagicSkillUse msk = new MagicSkillUse(activeChar, 1050, 1, teleportTimer, 0);
- Broadcast.toSelfAndKnownPlayersInRadius(activeChar, msk, 810000/*900*/);
+ Broadcast.toSelfAndKnownPlayersInRadius(activeChar, msk, 810000/* 900 */);
final SetupGauge sg = new SetupGauge(0, teleportTimer);
activeChar.sendPacket(sg);
- //End SoE Animation section
+ // End SoE Animation section
final EscapeFinalizer ef = new EscapeFinalizer(activeChar, partner.getX(), partner.getY(), partner.getZ(), partner.isIn7sDungeon());
// continue execution later
activeChar.setSkillCast(ThreadPoolManager.getInstance().scheduleGeneral(ef, teleportTimer));
- activeChar.forceIsCasting(GameTimeController.getGameTicks() + teleportTimer / GameTimeController.MILLIS_IN_TICK);
+ activeChar.forceIsCasting(GameTimeController.getGameTicks() + (teleportTimer / GameTimeController.MILLIS_IN_TICK));
return true;
}
@@ -449,9 +503,11 @@ public class Wedding implements IVoicedCommandHandler
public void run()
{
if (_activeChar.isDead())
+ {
return;
+ }
- if(SiegeManager.getInstance().getSiege(_partnerx, _partnery, _partnerz) != null && SiegeManager.getInstance().getSiege(_partnerx, _partnery, _partnerz).getIsInProgress())
+ if ((SiegeManager.getInstance().getSiege(_partnerx, _partnery, _partnerz) != null) && SiegeManager.getInstance().getSiege(_partnerx, _partnery, _partnerz).getIsInProgress())
{
_activeChar.sendMessage("Your partner is in siege, you can't go to your partner.");
return;
@@ -472,9 +528,6 @@ public class Wedding implements IVoicedCommandHandler
}
}
- /**
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
- */
@Override
public String[] getVoicedCommandList()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java
index b1538c7f88..32b2f27d85 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/castle.java
@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Castle;
/**
- *
*
*/
public class castle implements IVoicedCommandHandler
@@ -33,10 +32,6 @@ public class castle implements IVoicedCommandHandler
"ride wyvern"
};
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
- */
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
@@ -44,8 +39,10 @@ public class castle implements IVoicedCommandHandler
{
L2DoorInstance door = (L2DoorInstance) activeChar.getTarget();
Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getHasCastle());
- if (door == null || castle == null)
+ if ((door == null) || (castle == null))
+ {
return false;
+ }
if (castle.checkIfInZone(door.getX(), door.getY(), door.getZ()))
{
door.openMe();
@@ -54,19 +51,21 @@ public class castle implements IVoicedCommandHandler
}
else if (command.startsWith("close doors") && params.equals("castle") && (activeChar.isClanLeader()))
{
- L2DoorInstance door = (L2DoorInstance) activeChar.getTarget();
- Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getHasCastle());
- if (door == null || castle == null)
+ final L2DoorInstance door = (L2DoorInstance) activeChar.getTarget();
+ final Castle castle = CastleManager.getInstance().getCastleById(activeChar.getClan().getHasCastle());
+ if ((door == null) || (castle == null))
+ {
return false;
+ }
+
if (castle.checkIfInZone(door.getX(), door.getY(), door.getZ()))
{
door.closeMe();
}
-
}
else if (command.startsWith("ride wyvern") && params.equals("castle"))
{
- if (activeChar.getClan().getHasCastle() > 0 && activeChar.isClanLeader())
+ if ((activeChar.getClan().getHasCastle() > 0) && activeChar.isClanLeader())
{
activeChar.mount(12621, 0, true);
}
@@ -74,10 +73,6 @@ public class castle implements IVoicedCommandHandler
return true;
}
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
- */
@Override
public String[] getVoicedCommandList()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java
index 5dcc67f823..6cb6ce7e6e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/set.java
@@ -15,11 +15,12 @@
package handlers.voicedcommandhandlers;
import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
+import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.util.Util;
/**
- *
- *
+ * Fixed by Zoey76.
*/
public class set implements IVoicedCommandHandler
{
@@ -30,36 +31,31 @@ public class set implements IVoicedCommandHandler
"set group"
};
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
- */
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
if (command.startsWith("set privileges"))
{
- int n = Integer.parseInt(command.substring(15));
- L2PcInstance pc = (L2PcInstance) activeChar.getTarget();
- if (pc != null)
+ final String val = command.substring(15);
+ final L2Object target = activeChar.getTarget();
+ if (!Util.isDigit(val) || (target == null) || !target.isPlayer())
{
- if (activeChar.getClan().getClanId() == pc.getClan().getClanId() && (activeChar.getClanPrivileges() > n) || activeChar.isClanLeader())
- {
- pc.setClanPrivileges(n);
- activeChar.sendMessage("Your clan privileges have been set to " + n + " by " + activeChar.getName());
- }
-
+ return false;
}
+ final int n = Integer.parseInt(val);
+ final L2PcInstance player = target.getActingPlayer();
+ if ((activeChar.getClan() == null) || (player.getClan() == null) || (activeChar.getClan().getClanId() != player.getClan().getClanId()) || !((activeChar.getClanPrivileges() > n) || activeChar.isClanLeader()))
+ {
+ return false;
+ }
+
+ player.setClanPrivileges(n);
+ activeChar.sendMessage("Your clan privileges have been set to " + n + " by " + activeChar.getName() + ".");
}
-
return true;
}
- /**
- *
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
- */
@Override
public String[] getVoicedCommandList()
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/stats.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/stats.java
index 000f89c88c..0f5ff2d31a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/stats.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/voicedcommandhandlers/stats.java
@@ -17,9 +17,15 @@ package handlers.voicedcommandhandlers;
import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.L2Event;
+import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.util.StringUtil;
+/**
+ * @author Zoey76.
+ */
public class stats implements IVoicedCommandHandler
{
private static final String[] VOICED_COMMANDS =
@@ -27,37 +33,48 @@ public class stats implements IVoicedCommandHandler
"stats"
};
- /**
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#useVoicedCommand(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
- */
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params)
{
- if (command.equalsIgnoreCase("stats"))
+ if (!command.equals("stats") || (params == null) || !params.isEmpty())
+ {
+ activeChar.sendMessage("Syntax: .stats <player name>");
+ return false;
+ }
+
+ final L2PcInstance pc = L2World.getInstance().getPlayer(params);
+ if ((pc == null))
+ {
+ activeChar.sendPacket(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+ return false;
+ }
+
+ if (pc.getClient().isDetached())
+ {
+ final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_OFFLINE);
+ sm.addPcName(pc);
+ activeChar.sendPacket(sm);
+ return false;
+ }
+
+ if (!L2Event.isParticipant(pc) || (pc.getEventStatus() == null))
+ {
+ activeChar.sendMessage("That player is not an event participant.");
+ return false;
+ }
+
+ final StringBuilder replyMSG = StringUtil.startAppend(300 + (pc.getEventStatus().kills.size() * 50), "<html><body>" + "<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br><br>Statistics for player <font color=\"LEVEL\">", pc.getName(), "</font><br>Total kills <font color=\"FF0000\">", String.valueOf(pc.getEventStatus().kills.size()), "</font><br><br>Detailed list: <br>");
+ for (L2PcInstance plr : pc.getEventStatus().kills)
{
- L2PcInstance pc = L2World.getInstance().getPlayer(params);
- if ((pc != null) && (pc.getEventStatus() != null))
- {
- final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuilder replyMSG = StringUtil.startAppend(300 + (pc.getEventStatus().kills.size() * 50), "<html><body>" + "<center><font color=\"LEVEL\">[ L2J EVENT ENGINE ]</font></center><br>" + "<br>Statistics for player <font color=\"LEVEL\">", pc.getName(), "</font><br>" + "Total kills <font color=\"FF0000\">", String.valueOf(pc.getEventStatus().kills.size()), "</font><br>" + "<br>Detailed list: <br>");
-
- for (L2PcInstance plr : pc.getEventStatus().kills)
- {
- StringUtil.append(replyMSG, "<font color=\"FF0000\">", plr.getName(), "</font><br>");
- }
-
- replyMSG.append("</body></html>");
-
- adminReply.setHtml(replyMSG.toString());
- activeChar.sendPacket(adminReply);
- }
+ StringUtil.append(replyMSG, "<font color=\"FF0000\">", plr.getName(), "</font><br>");
}
+ replyMSG.append("</body></html>");
+ final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
+ adminReply.setHtml(replyMSG.toString());
+ activeChar.sendPacket(adminReply);
return true;
}
- /**
- * @see com.l2jserver.gameserver.handler.IVoicedCommandHandler#getVoicedCommandList()
- */
@Override
public String[] getVoicedCommandList()
{
--
GitLab