From e7fb24cc62a33e9b2a2a7e22cf1504a1dc0ce588 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 23 Sep 2020 05:39:39 +0000 Subject: [PATCH] Various typo fixes. --- .../dist/game/data/ItemAuctions.xml | 142 ++--- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 142 ++--- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 142 ++--- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 46 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 46 +- .../quests/Q10566_BestChoice/34362-02.htm | 2 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 46 +- .../quests/Q10566_BestChoice/34362-02.htm | 2 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 46 +- .../quests/Q10566_BestChoice/34362-02.htm | 2 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 46 +- .../quests/Q10566_BestChoice/34362-02.htm | 2 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/data/html/default/7311-2.htm | 2 +- .../game/data/html/villagemaster/30897.htm | 2 +- .../gameserver/model/zone/form/ZoneNPoly.java | 8 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../network/serverpackets/MultiSellList.java | 2 +- .../game/data/html/villagemaster/30897.htm | 2 +- .../quests/Q126_TheNameOfEvil_2/32115-22.htm | 2 +- .../quests/Q508_AClansReputation/30868-0b.htm | 2 +- .../quests/Q509_TheClansPrestige/31331-0b.htm | 2 +- .../gameserver/model/zone/form/ZoneNPoly.java | 8 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../network/serverpackets/MultiSellList.java | 2 +- .../sql/game/siegable_clanhall.sql | 6 +- .../dist/game/data/ItemAuctions.xml | 388 +++++++------- .../RainbowSpringsChateau.java | 2 +- .../conquerablehalls/flagwar/FlagWar.java | 2 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../instancemanager/CHSiegeManager.java | 2 +- .../entity/clanhall/ClanHallSiegeEngine.java | 2 +- .../model/entity/clanhall/SiegableHall.java | 4 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../sql/game/siegable_clanhall.sql | 6 +- .../dist/game/data/ItemAuctions.xml | 496 +++++++++--------- .../RainbowSpringsChateau.java | 2 +- .../conquerablehalls/flagwar/FlagWar.java | 2 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../instancemanager/CHSiegeManager.java | 2 +- .../entity/clanhall/ClanHallSiegeEngine.java | 2 +- .../model/entity/clanhall/SiegableHall.java | 4 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 4 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 4 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 4 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 4 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 4 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 4 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- .../dist/game/data/ItemAuctions.xml | 4 +- .../dist/game/data/xsd/ItemAuctions.xsd | 2 +- .../itemauction/ItemAuctionInstance.java | 8 +- .../gameserver/model/zone/form/ZoneNPoly.java | 6 +- .../zone/type/ResidenceHallTeleportZone.java | 2 +- .../clientpackets/RequestMakeMacro.java | 6 +- 130 files changed, 1032 insertions(+), 1032 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/ItemAuctions.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/ItemAuctions.xml index 4aaabc639c..0c957ef75d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/ItemAuctions.xml @@ -2,156 +2,156 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/ItemAuctions.xsd index 498c7d3b27..570b3473d3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 3ddece0977..efa02114f6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/ItemAuctions.xml b/L2J_Mobius_2.5_Underground/dist/game/data/ItemAuctions.xml index 4aaabc639c..0c957ef75d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/ItemAuctions.xml @@ -2,156 +2,156 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/ItemAuctions.xsd index 498c7d3b27..570b3473d3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 3ddece0977..efa02114f6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/ItemAuctions.xml b/L2J_Mobius_3.0_Helios/dist/game/data/ItemAuctions.xml index 4aaabc639c..0c957ef75d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/ItemAuctions.xml @@ -2,156 +2,156 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/ItemAuctions.xsd index 498c7d3b27..570b3473d3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/ItemAuctions.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/ItemAuctions.xml index 8443e8f0ea..0e7038a169 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/ItemAuctions.xml @@ -2,36 +2,36 @@ - + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/ItemAuctions.xsd index 498c7d3b27..570b3473d3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/ItemAuctions.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/ItemAuctions.xml index 8443e8f0ea..0e7038a169 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/ItemAuctions.xml @@ -2,36 +2,36 @@ - + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm index 6f50278348..fc4db7a11c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm @@ -1,4 +1,4 @@ Herphah:
-Weapon enhancement and fishing are goot examples. They can strenghten you indirectly. You should make use of every possible means to become stronger.
+Weapon enhancement and fishing are goot examples. They can strengthen you indirectly. You should make use of every possible means to become stronger.
\ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/ItemAuctions.xsd index 498c7d3b27..570b3473d3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/ItemAuctions.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/ItemAuctions.xml index 8443e8f0ea..0e7038a169 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/ItemAuctions.xml @@ -2,36 +2,36 @@ - + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm index 6f50278348..fc4db7a11c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm @@ -1,4 +1,4 @@ Herphah:
-Weapon enhancement and fishing are goot examples. They can strenghten you indirectly. You should make use of every possible means to become stronger.
+Weapon enhancement and fishing are goot examples. They can strengthen you indirectly. You should make use of every possible means to become stronger.
\ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/ItemAuctions.xsd index 498c7d3b27..570b3473d3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/ItemAuctions.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/ItemAuctions.xml index 53b9cf77b4..a8e7f38d2f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/ItemAuctions.xml @@ -2,36 +2,36 @@ - + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm index 6f50278348..fc4db7a11c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm @@ -1,4 +1,4 @@ Herphah:
-Weapon enhancement and fishing are goot examples. They can strenghten you indirectly. You should make use of every possible means to become stronger.
+Weapon enhancement and fishing are goot examples. They can strengthen you indirectly. You should make use of every possible means to become stronger.
\ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/ItemAuctions.xsd index 498c7d3b27..570b3473d3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/ItemAuctions.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/ItemAuctions.xml index 53b9cf77b4..a8e7f38d2f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/ItemAuctions.xml @@ -2,36 +2,36 @@ - + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm index 6f50278348..fc4db7a11c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10566_BestChoice/34362-02.htm @@ -1,4 +1,4 @@ Herphah:
-Weapon enhancement and fishing are goot examples. They can strenghten you indirectly. You should make use of every possible means to become stronger.
+Weapon enhancement and fishing are goot examples. They can strengthen you indirectly. You should make use of every possible means to become stronger.
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/ItemAuctions.xsd index 498c7d3b27..570b3473d3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_C1_HarbingersOfWar/dist/data/html/default/7311-2.htm b/L2J_Mobius_C1_HarbingersOfWar/dist/data/html/default/7311-2.htm index d6661ab53a..5234385f60 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/dist/data/html/default/7311-2.htm +++ b/L2J_Mobius_C1_HarbingersOfWar/dist/data/html/default/7311-2.htm @@ -7,7 +7,7 @@ enchanters, who communed with sprits. At the time when Elves began the war with the Orcs, they also began to teach Humans magic -to increase their army's strenght. Thus, they +to increase their army's strength. Thus, they built the School of Wizardry here, and selected and trained magically talented Humans.
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/villagemaster/30897.htm b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/villagemaster/30897.htm index dbf9d072dd..3b6b40674b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/villagemaster/30897.htm +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/html/villagemaster/30897.htm @@ -1,5 +1,5 @@ Head Blacksmith Roman:
-During Lionel Hunter's reign, Innadril enjoyed a long and prosperous peace. Ah, but he was a great man! He single-handedly defeated that frightful Fafurion's golem army, you know. What a feat of strenght and skill? But now it seems that long season of peace is about to end. Why else would there be so many orders for new weapons? Trouble's coming... I don't mean to complain, but I really don't see the virtue of all that banging about. The order blacksmiths may get swept up in the fever, but it seems a waste of time to me.
+During Lionel Hunter's reign, Innadril enjoyed a long and prosperous peace. Ah, but he was a great man! He single-handedly defeated that frightful Fafurion's golem army, you know. What a feat of strength and skill? But now it seems that long season of peace is about to end. Why else would there be so many orders for new weapons? Trouble's coming... I don't mean to complain, but I really don't see the virtue of all that banging about. The order blacksmiths may get swept up in the fever, but it seems a waste of time to me.
Listen to information about second class transfer
Sub Class
Clan
diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index ce3d3cc7a4..762367617b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -148,11 +148,11 @@ public class ZoneNPoly extends ZoneForm } int vx = _x[nextIndex] - _x[i]; int vy = _y[nextIndex] - _y[i]; - float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)); - lenght /= STEP; - for (int o = 1; o <= lenght; o++) + float length = (float) Math.sqrt((vx * vx) + (vy * vy)); + length /= STEP; + for (int o = 1; o <= length; o++) { - float k = o / lenght; + float k = o / length; dropDebugItem(id, (int) (_x[i] + (k * vx)), (int) (_y[i] + (k * vy)), z); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 1ee04edc4e..aab48fa6a1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro extends GameClientPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; /** @@ -56,7 +56,7 @@ public class RequestMakeMacro extends GameClientPacket final int d1 = readD(); // skill or page number for shortcuts final int d2 = readC(); final String command = readS(); - _commandsLenght += command.length() + 1; + _commandsLength += command.length() + 1; commands[i] = new MacroCmd(entry, type, d1, d2, command); } _macro = new Macro(id, icon, name, desc, acronym, commands); @@ -77,7 +77,7 @@ public class RequestMakeMacro extends GameClientPacket return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 82c83c48cc..839e25ef10 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -48,7 +48,7 @@ public class MultiSellList extends GameServerPacket writeD(_page); // page writeD(_finished); // finished writeD(0x28); // size of pages - writeD(_list == null ? 0 : _list.getEntries().size()); // list lenght + writeD(_list == null ? 0 : _list.getEntries().size()); // list length if (_list != null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/villagemaster/30897.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/villagemaster/30897.htm index 283964d47c..5725faf151 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/villagemaster/30897.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/villagemaster/30897.htm @@ -1,5 +1,5 @@ Head Blacksmith Roman:
-During Lionel Hunter's reign, Innadril enjoyed a long and prosperous peace. Ah, but he was a great man! He single-handedly defeated that frightful Fafurion's golem army, you know. What a feat of strenght and skill? But now it seems that long season of peace is about to end. Why else would there be so many orders for new weapons? Trouble's coming... I don't mean to complain, but I really don't see the virtue of all that banging about. The order blacksmiths may get swept up in the fever, but it seems a waste of time to me.
+During Lionel Hunter's reign, Innadril enjoyed a long and prosperous peace. Ah, but he was a great man! He single-handedly defeated that frightful Fafurion's golem army, you know. What a feat of strength and skill? But now it seems that long season of peace is about to end. Why else would there be so many orders for new weapons? Trouble's coming... I don't mean to complain, but I really don't see the virtue of all that banging about. The order blacksmiths may get swept up in the fever, but it seems a waste of time to me.
Listen to information about second class transfer
Sub Class
Clan
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q126_TheNameOfEvil_2/32115-22.htm b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q126_TheNameOfEvil_2/32115-22.htm index fd4bc8c970..7a183dcf3b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q126_TheNameOfEvil_2/32115-22.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q126_TheNameOfEvil_2/32115-22.htm @@ -1,5 +1,5 @@ Asamah:
-Einhasad and Gran Kain watched their 5 children grow, assigning each a duty suited to their individual abilities and strenghts. Two of the God-Childs gave them worry, though.
+Einhasad and Gran Kain watched their 5 children grow, assigning each a duty suited to their individual abilities and strengths. Two of the God-Childs gave them worry, though.
One was Shilen, whose many talents made any single duty seem too small. The other was Eva, whose quiet, passive nature seemed to obscure any talent she might have. Easily swayed by her siblings, she seemed to have no real will of her own.
Next. \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/30868-0b.htm b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/30868-0b.htm index 77c95dfa6a..6afec2949f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/30868-0b.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/30868-0b.htm @@ -2,6 +2,6 @@ Hearing this, you may think that the place has the bustling atmosphere of a metropolitan area. But due to its proximity to the border with Elmore, it always tends to maintain a somewhat tense atmosphere. The two types of atmosphere were always co-mingling and created a unique balance for years.
But an increasing number of powerful monsters started to be a major menace to this balance. Of course we, the honorable citizens of Aden can not get our hands bloody nor pose a risk to our personal belongings by sending the city guards into the task of making these daemons to retreat.
However, if we find some private army brave enough to join forces with us, there's one thing we can surely grant as a payment given our position and influence, and Reputation it is.
-I've been told you lead a personal army, but i'm afraid your fellows may lack the strenght required for we to engage in a business.
+I've been told you lead a personal army, but i'm afraid your fellows may lack the strength required for we to engage in a business.
(This quest may only be undertaken by a leader of a clan level 5 and above.) \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/31331-0b.htm b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/31331-0b.htm index 9e15df302f..f204073faf 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/31331-0b.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/31331-0b.htm @@ -2,6 +2,6 @@ Hearing this, you may think that the place has the bustling atmosphere of a metropolitan area. But due to its proximity to the border with Elmore, it always tends to maintain a somewhat tense atmosphere. The two types of atmosphere were always co-mingling and created a unique balance for years.
But an increasing number of powerful monsters started to be a major menace to this balance. Of course we, the honorable citizens of Rune can not get our hands bloody nor pose a risk to our personal belongings by sending the city guards into the task of making these daemons to retreat.
However, if we find some private army brave enough to join forces with us, there's one thing we can surely grant as a payment given our position and influence, and Reputation it is.
-I've been told you lead a personal army, but i'm afraid your fellows may lack the strenght required for we to engage in a business.
+I've been told you lead a personal army, but i'm afraid your fellows may lack the strength required for we to engage in a business.
(This quest may only be undertaken by a leader of a clan level 6 and above.) \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index ce3d3cc7a4..762367617b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -148,11 +148,11 @@ public class ZoneNPoly extends ZoneForm } int vx = _x[nextIndex] - _x[i]; int vy = _y[nextIndex] - _y[i]; - float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)); - lenght /= STEP; - for (int o = 1; o <= lenght; o++) + float length = (float) Math.sqrt((vx * vx) + (vy * vy)); + length /= STEP; + for (int o = 1; o <= length; o++) { - float k = o / lenght; + float k = o / length; dropDebugItem(id, (int) (_x[i] + (k * vx)), (int) (_y[i] + (k * vy)), z); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 1ee04edc4e..aab48fa6a1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro extends GameClientPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; /** @@ -56,7 +56,7 @@ public class RequestMakeMacro extends GameClientPacket final int d1 = readD(); // skill or page number for shortcuts final int d2 = readC(); final String command = readS(); - _commandsLenght += command.length() + 1; + _commandsLength += command.length() + 1; commands[i] = new MacroCmd(entry, type, d1, d2, command); } _macro = new Macro(id, icon, name, desc, acronym, commands); @@ -77,7 +77,7 @@ public class RequestMakeMacro extends GameClientPacket return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e79fcf8817..927655de1f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -48,7 +48,7 @@ public class MultiSellList extends GameServerPacket writeD(_page); // page writeD(_finished); // finished writeD(0x28); // size of pages - writeD(_list == null ? 0 : _list.getEntries().size()); // list lenght + writeD(_list == null ? 0 : _list.getEntries().size()); // list length if (_list != null) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_clanhall.sql b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_clanhall.sql index 2ad5a251e4..e38b1792ee 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_clanhall.sql +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/db_installer/sql/game/siegable_clanhall.sql @@ -13,16 +13,16 @@ CREATE TABLE IF NOT EXISTS `siegable_clanhall` ( `desc` varchar(100) DEFAULT NULL, `location` varchar(100) DEFAULT NULL, `nextSiege` bigint(20) DEFAULT NULL, - `siegeLenght` int(10) DEFAULT NULL, + `siegeLength` int(10) DEFAULT NULL, `schedule_config` varchar(20) DEFAULT NULL, PRIMARY KEY (`clanHallId`), KEY `ownerId` (`ownerId`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -INSERT IGNORE INTO `siegable_clanhall` (`clanHallId`, `name`, `ownerId`, `desc`, `location`, `nextSiege`, `siegeLenght`, `schedule_config`) VALUES +INSERT IGNORE INTO `siegable_clanhall` (`clanHallId`, `name`, `ownerId`, `desc`, `location`, `nextSiege`, `siegeLength`, `schedule_config`) VALUES (21, 'Fortress of Resistance', 0, 'Contestable Clan Hall', 'Dion', 0, 3600000, '14;0;0;12;00'), (34, 'Devastated Castle', 0, 'Contestable Clan Hall', 'Aden', 0, 3600000, '14;0;0;12;00'), (35, 'Bandit StrongHold', 0, 'Contestable Clan Hall', 'Oren', 0, 3600000, '14;0;0;12;00'), (62, 'Rainbow Springs', 0, 'Contestable Clan Hall', 'Goddard', 0, 3600000, '14;0;0;12;00'), (63, 'Beast Farm', 0, 'Contestable Clan Hall', 'Rune', 0, 3600000, '14;0;0;12;00'), -(64, 'Fortresss of the Dead', 0, 'Contestable Clan Hall', 'Rune', 0, 3600000, '14;0;0;12;00'); \ No newline at end of file +(64, 'Fortress of the Dead', 0, 'Contestable Clan Hall', 'Rune', 0, 3600000, '14;0;0;12;00'); \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/ItemAuctions.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/ItemAuctions.xml index 1d606d67ea..564b662444 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/ItemAuctions.xml @@ -2,330 +2,330 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index 9b27ca49d2..5f25e35434 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -141,7 +141,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine // XXX _rainbow.siegeStarts(); spawnGourds(); - _siegeEnd = ThreadPool.schedule(new SiegeEnd(null), _rainbow.getSiegeLenght() - 120000); + _siegeEnd = ThreadPool.schedule(new SiegeEnd(null), _rainbow.getSiegeLength() - 120000); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java index 8fb64fbe4d..ec079defe2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java @@ -149,7 +149,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } else { - TELE_ZONES[index].checkTeleporTask(); + TELE_ZONES[index].checkTeleportTask(); html = "teleporter.htm"; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/xsd/ItemAuctions.xsd index c7d9e75681..bfed88f30d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java index 90e726a73a..cd3071001d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java @@ -68,7 +68,7 @@ public class CHSiegeManager set.set("desc", rs.getString("desc")); set.set("location", rs.getString("location")); set.set("nextSiege", rs.getLong("nextSiege")); - set.set("siegeLenght", rs.getLong("siegeLenght")); + set.set("siegeLength", rs.getLong("siegeLength")); set.set("scheduleConfig", rs.getString("schedule_config")); final SiegableHall hall = new SiegableHall(set); _siegableHalls.put(id, hall); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java index 2246886174..23d7426e4c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java @@ -340,7 +340,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable _hall.updateSiegeStatus(SiegeStatus.RUNNING); onSiegeStarts(); - _siegeTask = ThreadPool.schedule(new SiegeEnds(), _hall.getSiegeLenght()); + _siegeTask = ThreadPool.schedule(new SiegeEnds(), _hall.getSiegeLength()); } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java index aa5ac6f89f..cee6ce4fb5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java @@ -59,7 +59,7 @@ public class SiegableHall extends ClanHall public SiegableHall(StatSet set) { super(set); - _siegeLength = set.getLong("siegeLenght"); + _siegeLength = set.getLong("siegeLength"); final String[] rawSchConfig = set.getString("scheduleConfig").split(";"); if (rawSchConfig.length == 5) { @@ -165,7 +165,7 @@ public class SiegableHall extends ClanHall return _nextSiege.getTimeInMillis(); } - public long getSiegeLenght() + public long getSiegeLength() { return _siegeLength; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 384738cce4..2fc719bd1a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index aad3d559d6..06536a1682 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(id, icon, name, desc, acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_clanhall.sql b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_clanhall.sql index 2ad5a251e4..e38b1792ee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_clanhall.sql +++ b/L2J_Mobius_CT_2.6_HighFive/dist/db_installer/sql/game/siegable_clanhall.sql @@ -13,16 +13,16 @@ CREATE TABLE IF NOT EXISTS `siegable_clanhall` ( `desc` varchar(100) DEFAULT NULL, `location` varchar(100) DEFAULT NULL, `nextSiege` bigint(20) DEFAULT NULL, - `siegeLenght` int(10) DEFAULT NULL, + `siegeLength` int(10) DEFAULT NULL, `schedule_config` varchar(20) DEFAULT NULL, PRIMARY KEY (`clanHallId`), KEY `ownerId` (`ownerId`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -INSERT IGNORE INTO `siegable_clanhall` (`clanHallId`, `name`, `ownerId`, `desc`, `location`, `nextSiege`, `siegeLenght`, `schedule_config`) VALUES +INSERT IGNORE INTO `siegable_clanhall` (`clanHallId`, `name`, `ownerId`, `desc`, `location`, `nextSiege`, `siegeLength`, `schedule_config`) VALUES (21, 'Fortress of Resistance', 0, 'Contestable Clan Hall', 'Dion', 0, 3600000, '14;0;0;12;00'), (34, 'Devastated Castle', 0, 'Contestable Clan Hall', 'Aden', 0, 3600000, '14;0;0;12;00'), (35, 'Bandit StrongHold', 0, 'Contestable Clan Hall', 'Oren', 0, 3600000, '14;0;0;12;00'), (62, 'Rainbow Springs', 0, 'Contestable Clan Hall', 'Goddard', 0, 3600000, '14;0;0;12;00'), (63, 'Beast Farm', 0, 'Contestable Clan Hall', 'Rune', 0, 3600000, '14;0;0;12;00'), -(64, 'Fortresss of the Dead', 0, 'Contestable Clan Hall', 'Rune', 0, 3600000, '14;0;0;12;00'); \ No newline at end of file +(64, 'Fortress of the Dead', 0, 'Contestable Clan Hall', 'Rune', 0, 3600000, '14;0;0;12;00'); \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/ItemAuctions.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/ItemAuctions.xml index 9750ba7c54..051852ff9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/ItemAuctions.xml @@ -2,534 +2,534 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index 9b27ca49d2..5f25e35434 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -141,7 +141,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine // XXX _rainbow.siegeStarts(); spawnGourds(); - _siegeEnd = ThreadPool.schedule(new SiegeEnd(null), _rainbow.getSiegeLenght() - 120000); + _siegeEnd = ThreadPool.schedule(new SiegeEnd(null), _rainbow.getSiegeLength() - 120000); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java index 8fb64fbe4d..ec079defe2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java @@ -149,7 +149,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine } else { - TELE_ZONES[index].checkTeleporTask(); + TELE_ZONES[index].checkTeleportTask(); html = "teleporter.htm"; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/ItemAuctions.xsd index c7d9e75681..bfed88f30d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java index 90e726a73a..cd3071001d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CHSiegeManager.java @@ -68,7 +68,7 @@ public class CHSiegeManager set.set("desc", rs.getString("desc")); set.set("location", rs.getString("location")); set.set("nextSiege", rs.getLong("nextSiege")); - set.set("siegeLenght", rs.getLong("siegeLenght")); + set.set("siegeLength", rs.getLong("siegeLength")); set.set("scheduleConfig", rs.getString("schedule_config")); final SiegableHall hall = new SiegableHall(set); _siegableHalls.put(id, hall); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java index 2246886174..23d7426e4c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java @@ -340,7 +340,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable _hall.updateSiegeStatus(SiegeStatus.RUNNING); onSiegeStarts(); - _siegeTask = ThreadPool.schedule(new SiegeEnds(), _hall.getSiegeLenght()); + _siegeTask = ThreadPool.schedule(new SiegeEnds(), _hall.getSiegeLength()); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java index aa5ac6f89f..cee6ce4fb5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/clanhall/SiegableHall.java @@ -59,7 +59,7 @@ public class SiegableHall extends ClanHall public SiegableHall(StatSet set) { super(set); - _siegeLength = set.getLong("siegeLenght"); + _siegeLength = set.getLong("siegeLength"); final String[] rawSchConfig = set.getString("scheduleConfig").split(";"); if (rawSchConfig.length == 5) { @@ -165,7 +165,7 @@ public class SiegableHall extends ClanHall return _nextSiege.getTimeInMillis(); } - public long getSiegeLenght() + public long getSiegeLength() { return _siegeLength; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 384738cce4..2fc719bd1a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index aad3d559d6..06536a1682 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(id, icon, name, desc, acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ItemAuctions.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ItemAuctions.xml index 1768d04268..95e35d502a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ItemAuctions.xml @@ -2,12 +2,12 @@ - + - + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/ItemAuctions.xsd index 93ede5b9e9..3599207ed2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/ItemAuctions.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/ItemAuctions.xml index 1768d04268..95e35d502a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/ItemAuctions.xml @@ -2,12 +2,12 @@ - + - + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/ItemAuctions.xsd index 93ede5b9e9..3599207ed2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/ItemAuctions.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/ItemAuctions.xml index 1768d04268..95e35d502a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/ItemAuctions.xml @@ -2,12 +2,12 @@ - + - + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/ItemAuctions.xsd index 93ede5b9e9..3599207ed2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/ItemAuctions.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/ItemAuctions.xml index 1768d04268..95e35d502a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/ItemAuctions.xml @@ -2,12 +2,12 @@ - + - + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/ItemAuctions.xsd index 93ede5b9e9..3599207ed2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/ItemAuctions.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/ItemAuctions.xml index 1768d04268..95e35d502a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/ItemAuctions.xml @@ -2,12 +2,12 @@ - + - + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/ItemAuctions.xsd index 93ede5b9e9..3599207ed2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ItemAuctions.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ItemAuctions.xml index 1768d04268..95e35d502a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/ItemAuctions.xml @@ -2,12 +2,12 @@ - + - + \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/ItemAuctions.xsd index 93ede5b9e9..3599207ed2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/ItemAuctions.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/ItemAuctions.xml index 1768d04268..95e35d502a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/ItemAuctions.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/ItemAuctions.xml @@ -2,12 +2,12 @@ - + - + \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/ItemAuctions.xsd b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/ItemAuctions.xsd index 93ede5b9e9..3599207ed2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/ItemAuctions.xsd +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/xsd/ItemAuctions.xsd @@ -19,7 +19,7 @@ - + diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 8b0351112b..b14135106f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -105,19 +105,19 @@ public class ItemAuctionInstance { final NamedNodeMap naa = na.getAttributes(); final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue()); - final int auctionLenght = Integer.parseInt(naa.getNamedItem("auctionLenght").getNodeValue()); + final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue()); final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue()); final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue()); final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue()); - if (auctionLenght < 1) + if (auctionLength < 1) { - throw new IllegalArgumentException("auctionLenght < 1 for instanceId: " + _instanceId + ", itemId " + itemId); + throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId); } final StatSet itemExtra = new StatSet(); - final AuctionItem item = new AuctionItem(auctionItemId, auctionLenght, auctionInitBid, itemId, itemCount, itemExtra); + final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra); if (!item.checkItemExists()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 3b1de8cd12..bd4514f0ab 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -101,10 +101,10 @@ public class ZoneNPoly extends ZoneForm final int nextIndex = (i + 1) == _p.xpoints.length ? 0 : i + 1; final int vx = _p.xpoints[nextIndex] - _p.xpoints[i]; final int vy = _p.ypoints[nextIndex] - _p.ypoints[i]; - final float lenght = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; - for (int o = 1; o <= lenght; o++) + final float length = (float) Math.sqrt((vx * vx) + (vy * vy)) / STEP; + for (int o = 1; o <= length; o++) { - dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / lenght) * vx)), (int) (_p.ypoints[i] + ((o / lenght) * vy)), z); + dropDebugItem(Inventory.ADENA_ID, 1, (int) (_p.xpoints[i] + ((o / length) * vx)), (int) (_p.ypoints[i] + ((o / length) * vy)), z); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java index 07a2c6efc4..e857ea3cc0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ResidenceHallTeleportZone.java @@ -58,7 +58,7 @@ public class ResidenceHallTeleportZone extends ResidenceTeleportZone return _id; } - public synchronized void checkTeleporTask() + public synchronized void checkTeleportTask() { if ((_teleTask == null) || _teleTask.isDone()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java index 9d285239ef..e7ff3b60e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java @@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class RequestMakeMacro implements IClientIncomingPacket { private Macro _macro; - private int _commandsLenght = 0; + private int _commandsLength = 0; private static final int MAX_MACRO_LENGTH = 12; @@ -56,7 +56,7 @@ public class RequestMakeMacro implements IClientIncomingPacket final int d1 = packet.readD(); // skill or page number for shortcuts final int d2 = packet.readC(); final String command = packet.readS(); - _commandsLenght += command.length(); + _commandsLength += command.length(); commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command)); } _macro = new Macro(_id, icon, _name, _desc, _acronym, commands); @@ -71,7 +71,7 @@ public class RequestMakeMacro implements IClientIncomingPacket { return; } - if (_commandsLenght > 255) + if (_commandsLength > 255) { // Invalid macro. Refer to the Help file for instructions. player.sendPacket(SystemMessageId.INVALID_MACRO_REFER_TO_THE_HELP_FILE_FOR_INSTRUCTIONS);