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

Separated multiple variable declarations.

Browse Source
This commit is contained in:
MobiusDev
2018-09-09 23:01:15 +00:00
parent d33bfa17b2
commit 0f430720db
881 changed files with 3909 additions and 1507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/crypt/BlowfishEngine.java
+4 -1
View File
@@ -1083,7 +1083,10 @@ public final class BlowfishEngine
private static final int BLOCK_SIZE = 8; // bytes = 64 bits
private static final int SBOX_SK = 256;
private static final int P_SZ = ROUNDS + 2;
private final int[] S0, S1, S2, S3; // the s-boxes
private final int[] S0; // the s-boxes
private final int[] S1; // the s-boxes
private final int[] S2; // the s-boxes
private final int[] S3; // the s-boxes
private final int[] P; // the p-array
private byte[] workingKey = null;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/GameTimeController.java
+2 -1
View File
@@ -140,7 +140,8 @@ public final class GameTimeController extends Thread
{
LOGGER.info(getClass().getSimpleName() + ": Started.");
long nextTickTime, sleepTime;
long nextTickTime;
long sleepTime;
boolean isNight = isNight();
if (isNight)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/MonsterRace.java
+3 -1
View File
@@ -30,7 +30,9 @@ public class MonsterRace
private final L2Npc[] _monsters;
private int[][] _speeds;
private final int[] _first, _second;
private final int[] _first;
private final int[] _second;
protected MonsterRace()
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java
+2 -1
View File
@@ -74,7 +74,8 @@ public class L2CharacterAI extends AbstractAI
public static class IntentionCommand
{
protected final CtrlIntention _crtlIntention;
protected final Object _arg0, _arg1;
protected final Object _arg0;
protected final Object _arg1;
protected IntentionCommand(CtrlIntention pIntention, Object pArg0, Object pArg1)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
+2 -1
View File
@@ -457,7 +457,8 @@ public class ClanTable
private void restorewars()
{
L2Clan clan1, clan2;
L2Clan clan1;
L2Clan clan2;
try (Connection con = DatabaseFactory.getConnection();
Statement statement = con.createStatement();
ResultSet rset = statement.executeQuery("SELECT clan1, clan2 FROM clan_wars"))
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/DoorData.java
+5 -1
View File
@@ -93,7 +93,11 @@ public class DoorData implements IGameXmlReader
public void insertCollisionData(StatsSet set)
{
int posX, posY, nodeX, nodeY, height;
int posX;
int posY;
int nodeX;
int nodeY;
int height;
height = set.getInt("height");
String[] pos = set.getString("node1").split(",");
nodeX = Integer.parseInt(pos[0]);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/BotReportTable.java
+4 -1
View File
@@ -568,7 +568,10 @@ public final class BotReportTable
{
if (qName.equals("punishment"))
{
int reportCount = -1, skillId = -1, skillLevel = 1, sysMessage = -1;
int reportCount = -1;
int skillId = -1;
int skillLevel = 1;
int sysMessage = -1;
try
{
reportCount = Integer.parseInt(attr.getValue("neededReportCount"));
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/skills/DocumentSkill.java
+64 -8
View File
@@ -529,7 +529,14 @@ public class DocumentSkill extends DocumentBase
for (int i = lastLvl; i < (lastLvl + enchantLevels1); i++)
{
_currentSkill.currentLevel = i - lastLvl;
boolean foundCond = false, foundFor = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
boolean foundCond = false;
boolean foundFor = false;
boolean foundChannelingEffects = false;
boolean foundStartEffects = false;
boolean foundPveEffects = false;
boolean foundPvpEffects = false;
boolean foundEndEffects = false;
boolean foundSelfEffects = false;
for (n = first; n != null; n = n.getNextSibling())
{
if ("enchant1cond".equalsIgnoreCase(n.getNodeName()))
@@ -648,7 +655,14 @@ public class DocumentSkill extends DocumentBase
}
for (int i = lastLvl + enchantLevels1; i < (lastLvl + enchantLevels1 + enchantLevels2); i++)
{
boolean foundCond = false, foundFor = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
boolean foundCond = false;
boolean foundFor = false;
boolean foundChannelingEffects = false;
boolean foundStartEffects = false;
boolean foundPveEffects = false;
boolean foundPvpEffects = false;
boolean foundEndEffects = false;
boolean foundSelfEffects = false;
_currentSkill.currentLevel = i - lastLvl - enchantLevels1;
for (n = first; n != null; n = n.getNextSibling())
{
@@ -764,7 +778,14 @@ public class DocumentSkill extends DocumentBase
}
for (int i = lastLvl + enchantLevels1 + enchantLevels2; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3); i++)
{
boolean foundCond = false, foundFor = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
boolean foundCond = false;
boolean foundFor = false;
boolean foundChannelingEffects = false;
boolean foundStartEffects = false;
boolean foundPveEffects = false;
boolean foundPvpEffects = false;
boolean foundEndEffects = false;
boolean foundSelfEffects = false;
_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2;
for (n = first; n != null; n = n.getNextSibling())
{
@@ -884,7 +905,14 @@ public class DocumentSkill extends DocumentBase
}
for (int i = lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4); i++)
{
boolean foundCond = false, foundFor = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
boolean foundCond = false;
boolean foundFor = false;
boolean foundChannelingEffects = false;
boolean foundStartEffects = false;
boolean foundPveEffects = false;
boolean foundPvpEffects = false;
boolean foundEndEffects = false;
boolean foundSelfEffects = false;
_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2 - enchantLevels3;
for (n = first; n != null; n = n.getNextSibling())
{
@@ -1004,7 +1032,14 @@ public class DocumentSkill extends DocumentBase
}
for (int i = lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5); i++)
{
boolean foundCond = false, foundFor = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
boolean foundCond = false;
boolean foundFor = false;
boolean foundChannelingEffects = false;
boolean foundStartEffects = false;
boolean foundPveEffects = false;
boolean foundPvpEffects = false;
boolean foundEndEffects = false;
boolean foundSelfEffects = false;
_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2 - enchantLevels3 - enchantLevels4;
for (n = first; n != null; n = n.getNextSibling())
{
@@ -1124,7 +1159,14 @@ public class DocumentSkill extends DocumentBase
}
for (int i = lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5 + enchantLevels6); i++)
{
boolean foundCond = false, foundFor = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
boolean foundCond = false;
boolean foundFor = false;
boolean foundChannelingEffects = false;
boolean foundStartEffects = false;
boolean foundPveEffects = false;
boolean foundPvpEffects = false;
boolean foundEndEffects = false;
boolean foundSelfEffects = false;
_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2 - enchantLevels3 - enchantLevels4 - enchantLevels5;
for (n = first; n != null; n = n.getNextSibling())
{
@@ -1244,7 +1286,14 @@ public class DocumentSkill extends DocumentBase
}
for (int i = lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5 + enchantLevels6; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5 + enchantLevels6 + enchantLevels7); i++)
{
boolean foundCond = false, foundFor = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
boolean foundCond = false;
boolean foundFor = false;
boolean foundChannelingEffects = false;
boolean foundStartEffects = false;
boolean foundPveEffects = false;
boolean foundPvpEffects = false;
boolean foundEndEffects = false;
boolean foundSelfEffects = false;
_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2 - enchantLevels3 - enchantLevels4 - enchantLevels5 - enchantLevels6;
for (n = first; n != null; n = n.getNextSibling())
{
@@ -1364,7 +1413,14 @@ public class DocumentSkill extends DocumentBase
}
for (int i = lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5 + enchantLevels6 + enchantLevels7; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5 + enchantLevels6 + enchantLevels7 + enchantLevels8); i++)
{
boolean foundCond = false, foundFor = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
boolean foundCond = false;
boolean foundFor = false;
boolean foundChannelingEffects = false;
boolean foundStartEffects = false;
boolean foundPveEffects = false;
boolean foundPvpEffects = false;
boolean foundEndEffects = false;
boolean foundSelfEffects = false;
_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2 - enchantLevels3 - enchantLevels4 - enchantLevels5 - enchantLevels6 - enchantLevels7;
for (n = first; n != null; n = n.getNextSibling())
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java
+3 -1
View File
@@ -65,7 +65,9 @@ public final class ClanHallManager
Statement s = con.createStatement();
ResultSet rs = s.executeQuery("SELECT * FROM clanhall ORDER BY id"))
{
int id, ownerId, lease;
int id;
int ownerId;
int lease;
while (rs.next())
{
final StatsSet set = new StatsSet();
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java
+10 -3
View File
@@ -122,7 +122,8 @@ public final class DimensionalRiftManager
public void loadSpawns()
{
int countGood = 0, countBad = 0;
int countGood = 0;
int countBad = 0;
try
{
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -138,8 +139,14 @@ public final class DimensionalRiftManager
final Document doc = factory.newDocumentBuilder().parse(file);
NamedNodeMap attrs;
byte type, roomId;
int mobId, x, y, z, delay, count;
byte type;
byte roomId;
int mobId;
int x;
int y;
int z;
int delay;
int count;
for (Node rift = doc.getFirstChild(); rift != null; rift = rift.getNextSibling())
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java
+3 -1
View File
@@ -151,7 +151,9 @@ public final class MercTicketManager
{
int npcId;
int itemId;
int x, y, z;
int x;
int y;
int z;
final int mercPlaced[] = new int[20];
// start index to begin the search for the itemId corresponding to this NPC
// this will help with:
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
+5 -2
View File
@@ -144,8 +144,11 @@ public final class ZoneManager implements IGameXmlReader
Node attribute;
String zoneName;
int[][] coords;
int zoneId, minZ, maxZ;
String zoneType, zoneShape;
int zoneId;
int minZ;
int maxZ;
String zoneType;
String zoneShape;
final List<int[]> rs = new ArrayList<>();
for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Radar.java
+4 -1
View File
@@ -80,7 +80,10 @@ public final class L2Radar
public static class RadarMarker
{
// Simple class to model radar points.
public int _type, _x, _y, _z;
public int _type;
public int _x;
public int _y;
public int _z;
public RadarMarker(int type, int x, int y, int z)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2Territory.java
+5 -1
View File
@@ -32,7 +32,11 @@ public class L2Territory
protected static class Point
{
protected int _x, _y, _zmin, _zmax, _proc;
protected int _x;
protected int _y;
protected int _zmin;
protected int _zmax;
protected int _proc;
Point(int x, int y, int zmin, int zmax, int proc)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/SeedProduction.java
+2 -1
View File
@@ -63,7 +63,8 @@ public class SeedProduction
public final boolean decreaseAmount(long val)
{
long current, next;
long current;
long next;
do
{
current = _amount.get();
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TeleportBookmark.java
+2 -1
View File
@@ -23,7 +23,8 @@ public class TeleportBookmark extends Location
{
private final int _id;
private int _icon;
private String _name, _tag;
private String _name;
private String _tag;
public TeleportBookmark(int id, int x, int y, int z, int icon, String tag, String name)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/TradeList.java
+2 -1
View File
@@ -390,7 +390,8 @@ public class TradeList
}
// Synchronization order to avoid deadlock
TradeList sync1, sync2;
TradeList sync1;
TradeList sync2;
if (getOwner().getObjectId() > partnerList.getOwner().getObjectId())
{
sync1 = partnerList;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+13 -4
View File
@@ -3893,7 +3893,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
final int yPrev = getY();
int zPrev = getZ(); // the z coordinate may be modified by coordinate synchronizations
double dx, dy, dz;
double dx;
double dy;
double dz;
if (Config.COORD_SYNCHRONIZE == 1)
// the only method that can modify x,y while moving (otherwise _move would/should be set null)
{
@@ -5795,7 +5797,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
*/
public boolean isBehind(L2Object target)
{
double angleChar, angleTarget, angleDiff;
double angleChar;
double angleTarget;
double angleDiff;
final double maxAngleDiff = 60;
if (target == null)
@@ -5836,7 +5840,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
*/
public boolean isInFrontOf(L2Object target)
{
double angleChar, angleTarget, angleDiff;
double angleChar;
double angleTarget;
double angleDiff;
final double maxAngleDiff = 60;
if (target == null)
{
@@ -5864,7 +5870,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
*/
public boolean isFacing(L2Object target, int maxAngle)
{
double angleChar, angleTarget, angleDiff, maxAngleDiff;
double angleChar;
double angleTarget;
double angleDiff;
double maxAngleDiff;
if (target == null)
{
return false;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java
+3 -1
View File
@@ -665,7 +665,9 @@ public final class L2CubicInstance implements IIdentifiable
return false;
}
int x, y, z;
int x;
int y;
int z;
// temporary range check until real behavior of cubics is known/coded
final int range = MAX_MAGIC_RANGE;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java
+2 -1
View File
@@ -162,7 +162,8 @@ public class L2FortManagerInstance extends L2MerchantInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player, "data/html/fortress/foreman-castlereport.htm");
html.replace("%objectId%", String.valueOf(getObjectId()));
int hour, minutes;
int hour;
int minutes;
if (Config.FS_MAX_OWN_TIME > 0)
{
hour = (int) Math.floor(getFort().getTimeTillRebelArmy() / 3600);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java
+7 -4
View File
@@ -309,7 +309,8 @@ public class L2RaceManagerInstance extends L2Npc
return;
}
final int npcId = getTemplate().getId();
String filename, search;
String filename;
String search;
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
filename = getHtmlPath(npcId, 5);
html.setFile(player, filename);
@@ -328,7 +329,8 @@ public class L2RaceManagerInstance extends L2Npc
public void showMonsterInfo(L2PcInstance player)
{
final int npcId = getTemplate().getId();
String filename, search;
String filename;
String search;
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
filename = getHtmlPath(npcId, 6);
html.setFile(player, filename);
@@ -351,7 +353,9 @@ public class L2RaceManagerInstance extends L2Npc
}
final int npcId = getTemplate().getId();
SystemMessage sm;
String filename, search, replace;
String filename;
String search;
String replace;
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (val < 10)
{
@@ -536,5 +540,4 @@ public class L2RaceManagerInstance extends L2Npc
}
}
}
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java
+3 -1
View File
@@ -54,7 +54,9 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
private static final int DURATION_INCREASE_INTERVAL = 20000; // 20 secs (gained upon feeding)
private static final int BUFF_INTERVAL = 5000; // 5 seconds
private int _remainingTime = MAX_DURATION;
private int _homeX, _homeY, _homeZ;
private int _homeX;
private int _homeY;
private int _homeZ;
protected L2PcInstance _owner;
private Future<?> _buffTask = null;
private Future<?> _durationCheckTask = null;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/tasks/player/LookingForFishTask.java
+2 -1
View File
@@ -26,7 +26,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public class LookingForFishTask implements Runnable
{
private final L2PcInstance _player;
private final boolean _isNoob, _isUpperGrade;
private final boolean _isNoob;
private final boolean _isUpperGrade;
private final int _fishGroup;
private final double _fishGutsCheck;
private final long _endTaskTime;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/clientstrings/Builder.java
+7 -2
View File
@@ -33,12 +33,17 @@ public abstract class Builder
{
final ArrayList<Builder> builders = new ArrayList<>();
int index1 = 0, index2 = 0, paramId, subTextLen;
int index1 = 0;
int index2 = 0;
int paramId;
int subTextLen;
final char[] array = text.toCharArray();
final int arrayLength = array.length;
char c, c2, c3;
char c;
char c2;
char c3;
LOOP: for (; index1 < arrayLength; index1++)
{
c = array[index1];
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/clientstrings/BuilderContainer.java
+3 -1
View File
@@ -46,7 +46,9 @@ final class BuilderContainer extends Builder
Builder builder;
String build;
int i, paramIndex, buildTextLen = 0;
int i;
int paramIndex;
int buildTextLen = 0;
if (paramsLength != 0)
{
for (i = buildersLength; i-- > 0;)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java
+7 -3
View File
@@ -318,7 +318,9 @@ public final class BlockCheckerEngine
public class StartEvent implements Runnable
{
// In event used skills
private final Skill _freeze, _transformationRed, _transformationBlue;
private final Skill _freeze;
private final Skill _transformationRed;
private final Skill _transformationBlue;
// Common and unparametizer packet
private final ExCubeGameCloseUI _closeUserInterface = new ExCubeGameCloseUI();
@@ -658,8 +660,10 @@ public final class BlockCheckerEngine
}
}
int first = 0, second = 0;
L2PcInstance winner1 = null, winner2 = null;
int first = 0;
int second = 0;
L2PcInstance winner1 = null;
L2PcInstance winner2 = null;
for (Entry<L2PcInstance, Integer> entry : tempPoints.entrySet())
{
final L2PcInstance pc = entry.getKey();
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Duel.java
+3 -1
View File
@@ -125,7 +125,9 @@ public class Duel
private double _mp;
private double _cp;
private boolean _paDuel;
private int _x, _y, _z;
private int _x;
private int _y;
private int _z;
private Set<Skill> _debuffs;
public PlayerCondition(L2PcInstance player, boolean partyDuel)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/Message.java
+7 -3
View File
@@ -44,12 +44,16 @@ public class Message
public static final int READED = 1;
public static final int REJECTED = 2;
private final int _messageId, _senderId, _receiverId;
private final int _messageId;
private final int _senderId;
private final int _receiverId;
private final long _expiration;
private String _senderName = null;
private String _receiverName = null;
private final String _subject, _content;
private boolean _unread, _returned;
private final String _subject;
private final String _content;
private boolean _unread;
private boolean _returned;
private int _sendBySystem;
private boolean _deletedBySender;
private boolean _deletedByReceiver;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java
+4 -2
View File
@@ -150,7 +150,8 @@ public class TvTEvent
private static int highestLevelPcInstanceOf(Map<Integer, L2PcInstance> players)
{
int maxLevel = Integer.MIN_VALUE, maxLevelId = -1;
int maxLevel = Integer.MIN_VALUE;
int maxLevelId = -1;
for (L2PcInstance player : players.values())
{
if (player.getLevel() >= maxLevel)
@@ -200,7 +201,8 @@ public class TvTEvent
0,
0
};
int priority = 0, highestLevelPlayerId;
int priority = 0;
int highestLevelPlayerId;
L2PcInstance highestLevelPlayer;
// TODO: allParticipants should be sorted by level instead of using highestLevelPcInstanceOf for every fetch
while (!allParticipants.isEmpty())
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/Instance.java
+8 -1
View File
@@ -596,7 +596,14 @@ public final class Instance
final String spawnGroup = group.getAttributes().getNamedItem("name").getNodeValue();
for (Node d = group.getFirstChild(); d != null; d = d.getNextSibling())
{
int npcId = 0, x = 0, y = 0, z = 0, heading = 0, respawn = 0, respawnRandom = 0, delay = -1;
int npcId = 0;
int x = 0;
int y = 0;
int z = 0;
int heading = 0;
int respawn = 0;
int respawnRandom = 0;
int delay = -1;
Boolean allowRandomWalk = null;
if ("npc".equalsIgnoreCase(d.getNodeName()))
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+4 -2
View File
@@ -275,7 +275,8 @@ public abstract class Inventory extends ItemContainer
}
final L2PcInstance player = (L2PcInstance) inventory.getOwner();
Skill enchant4Skill, itemSkill;
Skill enchant4Skill;
Skill itemSkill;
final L2Item it = item.getItem();
boolean update = false;
boolean updateTimeStamp = false;
@@ -395,7 +396,8 @@ public abstract class Inventory extends ItemContainer
final L2PcInstance player = (L2PcInstance) inventory.getOwner();
Skill enchant4Skill, itemSkill;
Skill enchant4Skill;
Skill itemSkill;
final L2Item it = item.getItem();
boolean update = false;
boolean updateTimeStamp = false;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
+12 -3
View File
@@ -1456,8 +1456,15 @@ public final class L2ItemInstance extends L2Object
public static L2ItemInstance restoreFromDb(int ownerId, ResultSet rs)
{
L2ItemInstance inst = null;
int objectId, item_id, loc_data, enchant_level, custom_type1, custom_type2, manaLeft;
long time, count;
int objectId;
int item_id;
int loc_data;
int enchant_level;
int custom_type1;
int custom_type2;
int manaLeft;
long time;
long count;
ItemLocation loc;
try
{
@@ -1525,7 +1532,9 @@ public final class L2ItemInstance extends L2Object
*/
public class ItemDropTask implements Runnable
{
private int _x, _y, _z;
private int _x;
private int _y;
private int _z;
private final L2Character _dropper;
private final L2ItemInstance _itm;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/multisell/ItemInfo.java
+2 -1
View File
@@ -24,7 +24,8 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
*/
public class ItemInfo
{
private final int _enchantLevel, _augmentId;
private final int _enchantLevel;
private final int _augmentId;
private final byte _elementId;
private final int _elementPower;
private final int[] _elementals = new int[6];
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java
+2 -1
View File
@@ -30,7 +30,8 @@ import com.l2jmobius.gameserver.model.zone.L2ZoneForm;
*/
public class ZoneCuboid extends L2ZoneForm
{
private final int _z1, _z2;
private final int _z1;
private final int _z2;
private final Rectangle _r;
public ZoneCuboid(int x1, int x2, int y1, int y2, int z1, int z2)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java
+10 -7
View File
@@ -28,7 +28,12 @@ import com.l2jmobius.gameserver.model.zone.L2ZoneForm;
*/
public class ZoneCylinder extends L2ZoneForm
{
private final int _x, _y, _z1, _z2, _rad, _radS;
private final int _x;
private final int _y;
private final int _z1;
private final int _z2;
private final int _rad;
private final int _radS;
public ZoneCylinder(int x, int y, int z1, int z2, int rad)
{
@@ -133,12 +138,10 @@ public class ZoneCylinder extends L2ZoneForm
@Override
public Location getRandomPoint()
{
int x, y, q, r;
q = (int) (Rnd.get() * 2 * Math.PI);
r = (int) Math.sqrt(Rnd.get());
x = (int) ((_rad * r * Math.cos(q)) + _x);
y = (int) ((_rad * r * Math.sin(q)) + _y);
final int q = (int) (Rnd.get() * 2 * Math.PI);
final int r = (int) Math.sqrt(Rnd.get());
final int x = (int) ((_rad * r * Math.cos(q)) + _x);
final int y = (int) ((_rad * r * Math.sin(q)) + _y);
return new Location(x, y, GeoEngine.getInstance().getHeight(x, y, _z1));
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java
+4 -5
View File
@@ -65,7 +65,8 @@ public class ZoneNPoly extends L2ZoneForm
{
final int[] _x = _p.xpoints;
final int[] _y = _p.ypoints;
double test, shortestDist = Math.pow(_x[0] - x, 2) + Math.pow(_y[0] - y, 2);
double test;
double shortestDist = Math.pow(_x[0] - x, 2) + Math.pow(_y[0] - y, 2);
for (int i = 1; i < _p.npoints; i++)
{
@@ -111,15 +112,13 @@ public class ZoneNPoly extends L2ZoneForm
@Override
public Location getRandomPoint()
{
int x, y;
final int _minX = _p.getBounds().x;
final int _maxX = _p.getBounds().x + _p.getBounds().width;
final int _minY = _p.getBounds().y;
final int _maxY = _p.getBounds().y + _p.getBounds().height;
x = Rnd.get(_minX, _maxX);
y = Rnd.get(_minY, _maxY);
int x = Rnd.get(_minX, _maxX);
int y = Rnd.get(_minY, _maxY);
int antiBlocker = 0;
while (!_p.contains(x, y) && (antiBlocker++ < 1000))
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/NpcStringId.java
+2 -1
View File
@@ -17821,7 +17821,8 @@ public final class NpcStringId
private static int parseMessageParameters(String name)
{
int paramCount = 0;
char c1, c2;
char c1;
char c2;
for (int i = 0; i < (name.length() - 1); i++)
{
c1 = name.charAt(i);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/SystemMessageId.java
+2 -1
View File
@@ -9784,7 +9784,8 @@ public final class SystemMessageId
private static int parseMessageParameters(String name)
{
int paramCount = 0;
char c1, c2;
char c1;
char c2;
for (int i = 0; i < (name.length() - 1); i++)
{
c1 = name.charAt(i);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeNicknameColor.java
+2 -1
View File
@@ -40,7 +40,8 @@ public class RequestChangeNicknameColor implements IClientIncomingPacket
0x999999, // Silver
};
private int _colorNum, _itemObjectId;
private int _colorNum;
private int _itemObjectId;
private String _title;
@Override
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
+2 -1
View File
@@ -60,7 +60,8 @@ public final class RequestDuelAnswerStart implements IClientIncomingPacket
if (_response == 1)
{
SystemMessage msg1 = null, msg2 = null;
SystemMessage msg1 = null;
SystemMessage msg2 = null;
if (requestor.isInDuel())
{
msg1 = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
+2 -1
View File
@@ -29,7 +29,8 @@ import com.l2jmobius.gameserver.security.SecondaryPasswordAuth;
public class RequestEx2ndPasswordReq implements IClientIncomingPacket
{
private int _changePass;
private String _password, _newPassword;
private String _password;
private String _newPassword;
@Override
public boolean read(L2GameClient client, PacketReader packet)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+4 -1
View File
@@ -29,7 +29,10 @@ import com.l2jmobius.gameserver.network.serverpackets.StopMoveInVehicle;
*/
public final class RequestGetOffVehicle implements IClientIncomingPacket
{
private int _boatId, _x, _y, _z;
private int _boatId;
private int _x;
private int _y;
private int _z;
@Override
public boolean read(L2GameClient client, PacketReader packet)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+1 -5
View File
@@ -38,12 +38,8 @@ public final class RequestGetOnVehicle implements IClientIncomingPacket
@Override
public boolean read(L2GameClient client, PacketReader packet)
{
int x, y, z;
_boatId = packet.readD();
x = packet.readD();
y = packet.readD();
z = packet.readD();
_pos = new Location(x, y, z);
_pos = new Location(packet.readD(), packet.readD(), packet.readD());
return true;
}
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
+4 -2
View File
@@ -26,8 +26,10 @@ import com.l2jmobius.gameserver.network.L2GameClient;
*/
public final class RequestModifyBookMarkSlot implements IClientIncomingPacket
{
private int id, icon;
private String name, tag;
private int id;
private int icon;
private String name;
private String tag;
@Override
public boolean read(L2GameClient client, PacketReader packet)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
+3 -1
View File
@@ -34,7 +34,9 @@ import com.l2jmobius.gameserver.network.serverpackets.PartyMatchDetail;
*/
public final class RequestPartyMatchConfig implements IClientIncomingPacket
{
private int _auto, _loc, _lvl;
private int _auto;
private int _loc;
private int _lvl;
@Override
public boolean read(L2GameClient client, PacketReader packet)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
+2 -1
View File
@@ -67,7 +67,8 @@ public final class RequestPledgeSetAcademyMaster implements IClientIncomingPacke
return;
}
L2ClanMember apprenticeMember, sponsorMember;
L2ClanMember apprenticeMember;
L2ClanMember sponsorMember;
if (currentMember.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
{
apprenticeMember = currentMember;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java
+2 -1
View File
@@ -104,7 +104,8 @@ public class RequestProcureCropList implements IClientIncomingPacket
return;
}
int slots = 0, weight = 0;
int slots = 0;
int weight = 0;
for (CropHolder i : _items)
{
final L2ItemInstance item = player.getInventory().getItemByObjectId(i.getObjectId());
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
+2 -1
View File
@@ -27,7 +27,8 @@ import com.l2jmobius.gameserver.network.L2GameClient;
public final class RequestSaveBookMarkSlot implements IClientIncomingPacket
{
private int icon;
private String name, tag;
private String name;
private String tag;
@Override
public boolean read(L2GameClient client, PacketReader packet)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
+3 -1
View File
@@ -76,7 +76,9 @@ public class ValidatePosition implements IClientIncomingPacket
}
}
int dx, dy, dz;
int dx;
int dy;
int dz;
double diffSq;
if (activeChar.isInBoat())
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java
+20 -8
View File
@@ -33,17 +33,29 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public abstract class AbstractNpcInfo implements IClientOutgoingPacket
{
protected int _x, _y, _z, _heading;
protected int _x;
protected int _y;
protected int _z;
protected int _heading;
protected int _idTemplate;
protected boolean _isAttackable, _isSummoned;
protected int _mAtkSpd, _pAtkSpd;
protected final int _runSpd, _walkSpd;
protected final int _swimRunSpd, _swimWalkSpd;
protected final int _flyRunSpd, _flyWalkSpd;
protected boolean _isAttackable;
protected boolean _isSummoned;
protected int _mAtkSpd;
protected int _pAtkSpd;
protected final int _runSpd;
protected final int _walkSpd;
protected final int _swimRunSpd;
protected final int _swimWalkSpd;
protected final int _flyRunSpd;
protected final int _flyWalkSpd;
protected double _moveMultiplier;
protected int _rhand, _lhand, _chest, _enchantEffect;
protected double _collisionHeight, _collisionRadius;
protected int _rhand;
protected int _lhand;
protected int _chest;
protected int _enchantEffect;
protected double _collisionHeight;
protected double _collisionRadius;
protected String _name = "";
protected String _title = "";
protected final boolean _gmSeeInvis;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java
+3 -1
View File
@@ -47,7 +47,9 @@ public class AllianceInfo implements IClientOutgoingPacket
final Collection<L2Clan> allies = ClanTable.getInstance().getClanAllies(allianceId);
_allies = new ClanInfo[allies.size()];
int idx = 0, total = 0, online = 0;
int idx = 0;
int total = 0;
int online = 0;
for (L2Clan clan : allies)
{
final ClanInfo ci = new ClanInfo(clan);
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java
+3 -1
View File
@@ -24,7 +24,9 @@ public class ChangeWaitType implements IClientOutgoingPacket
{
private final int _charObjId;
private final int _moveType;
private final int _x, _y, _z;
private final int _x;
private final int _y;
private final int _z;
public static final int WT_SITTING = 0;
public static final int WT_STANDING = 1;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java
+8 -4
View File
@@ -30,10 +30,14 @@ public class CharInfo implements IClientOutgoingPacket
{
private final L2PcInstance _activeChar;
private int _objId;
private int _x, _y, _z, _heading;
private final int _mAtkSpd, _pAtkSpd;
private final int _runSpd, _walkSpd;
private int _x;
private int _y;
private int _z;
private int _heading;
private final int _mAtkSpd;
private final int _pAtkSpd;
private final int _runSpd;
private final int _walkSpd;
private final int _swimRunSpd;
private final int _swimWalkSpd;
private final int _flyRunSpd;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
+2 -1
View File
@@ -28,7 +28,8 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket
public static final int PASSWORD_WRONG = 0x01;
public static final int PASSWORD_BAN = 0x02;
private final int _wrongTentatives, _mode;
private final int _wrongTentatives;
private final int _mode;
public Ex2ndPasswordVerify(int mode, int wrongTentatives)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java
+8 -1
View File
@@ -24,7 +24,14 @@ public class ExAirShipInfo implements IClientOutgoingPacket
{
// store some parameters, because they can be changed during broadcast
private final L2AirShipInstance _ship;
private final int _x, _y, _z, _heading, _moveSpeed, _rotationSpeed, _captain, _helm;
private final int _x;
private final int _y;
private final int _z;
private final int _heading;
private final int _moveSpeed;
private final int _rotationSpeed;
private final int _captain;
private final int _helm;
public ExAirShipInfo(L2AirShipInstance ship)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java
+5 -1
View File
@@ -23,7 +23,11 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class ExAirShipStopMove implements IClientOutgoingPacket
{
private final int _playerId, _airShipId, _x, _y, _z;
private final int _playerId;
private final int _airShipId;
private final int _x;
private final int _y;
private final int _z;
public ExAirShipStopMove(L2PcInstance player, L2AirShipInstance ship, int x, int y, int z)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
+3 -1
View File
@@ -27,7 +27,9 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket
public static final ExChangeClientEffectInfo STATIC_FREYA_DEFAULT = new ExChangeClientEffectInfo(0, 0, 1);
public static final ExChangeClientEffectInfo STATIC_FREYA_DESTROYED = new ExChangeClientEffectInfo(0, 0, 2);
private final int _type, _key, _value;
private final int _type;
private final int _key;
private final int _value;
/**
* @param type
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java
+7 -1
View File
@@ -26,7 +26,13 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class ExFishingHpRegen implements IClientOutgoingPacket
{
private final L2Character _activeChar;
private final int _time, _fishHP, _hpMode, _anim, _goodUse, _penalty, _hpBarColor;
private final int _time;
private final int _fishHP;
private final int _hpMode;
private final int _anim;
private final int _goodUse;
private final int _penalty;
private final int _hpBarColor;
public ExFishingHpRegen(L2Character character, int time, int fishHP, int HPmode, int GoodUse, int anim, int penalty, int hpBarColor)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java
+4 -1
View File
@@ -26,7 +26,10 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class ExFishingStart implements IClientOutgoingPacket
{
private final L2Character _activeChar;
private final int _x, _y, _z, _fishType;
private final int _x;
private final int _y;
private final int _z;
private final int _fishType;
private final boolean _isNightLure;
public ExFishingStart(L2Character character, int fishType, int x, int y, int z, boolean isNightLure)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java
+5 -2
View File
@@ -26,8 +26,11 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class ExFishingStartCombat implements IClientOutgoingPacket
{
private final L2Character _activeChar;
private final int _time, _hp;
private final int _lureType, _deceptiveMode, _mode;
private final int _time;
private final int _hp;
private final int _lureType;
private final int _deceptiveMode;
private final int _mode;
public ExFishingStartCombat(L2Character character, int time, int hp, int mode, int lureType, int deceptiveMode)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java
+5 -1
View File
@@ -22,7 +22,11 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class ExGetOffAirShip implements IClientOutgoingPacket
{
private final int _playerId, _airShipId, _x, _y, _z;
private final int _playerId;
private final int _airShipId;
private final int _x;
private final int _y;
private final int _z;
public ExGetOffAirShip(L2Character player, L2Character ship, int x, int y, int z)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java
+2 -1
View File
@@ -24,7 +24,8 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class ExGetOnAirShip implements IClientOutgoingPacket
{
private final int _playerId, _airShipId;
private final int _playerId;
private final int _airShipId;
private final Location _pos;
public ExGetOnAirShip(L2PcInstance player, L2Character ship)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
+3 -1
View File
@@ -25,7 +25,9 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket
{
private final int _mode, _LeaderOID, _memberCount;
private final int _mode;
private final int _LeaderOID;
private final int _memberCount;
private final String _name;
/**
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
+7 -1
View File
@@ -22,7 +22,13 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class ExMoveToLocationAirShip implements IClientOutgoingPacket
{
private final int _objId, _tx, _ty, _tz, _x, _y, _z;
private final int _objId;
private final int _tx;
private final int _ty;
private final int _tz;
private final int _x;
private final int _y;
private final int _z;
public ExMoveToLocationAirShip(L2Character cha)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java
+2 -1
View File
@@ -27,7 +27,8 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class ExNeedToChangeName implements IClientOutgoingPacket
{
private final int _type, _subType;
private final int _type;
private final int _subType;
private final String _name;
public ExNeedToChangeName(int type, int subType, String name)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExRotation.java
+2 -1
View File
@@ -24,7 +24,8 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class ExRotation implements IClientOutgoingPacket
{
private final int _charId, _heading;
private final int _charId;
private final int _heading;
public ExRotation(int charId, int heading)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java
+5 -1
View File
@@ -25,7 +25,11 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class ExStopMoveAirShip implements IClientOutgoingPacket
{
private final int _objectId, _x, _y, _z, _heading;
private final int _objectId;
private final int _x;
private final int _y;
private final int _z;
private final int _heading;
public ExStopMoveAirShip(L2Character ship)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java
+4 -1
View File
@@ -28,7 +28,10 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket
{
private final L2PcInstance _activeChar;
private final int _shipObjId;
private final int x, y, z, h;
private final int x;
private final int y;
private final int z;
private final int h;
public ExStopMoveInAirShip(L2PcInstance player, int shipObjId)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExUISetting.java
+2 -1
View File
@@ -30,7 +30,8 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class ExUISetting implements IClientOutgoingPacket
{
private final UIKeysSettings _uiSettings;
private int buffsize, categories;
private int buffsize;
private int categories;
public ExUISetting(L2PcInstance player)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
+5 -1
View File
@@ -27,7 +27,11 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class ExValidateLocationInAirShip implements IClientOutgoingPacket
{
private final L2PcInstance _activeChar;
private final int shipId, x, y, z, h;
private final int shipId;
private final int x;
private final int y;
private final int z;
private final int h;
public ExValidateLocationInAirShip(L2PcInstance player)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java
+8 -3
View File
@@ -33,9 +33,14 @@ public class FakePlayerInfo implements IClientOutgoingPacket
{
private final L2Npc _npc;
private final int _objId;
private final int _x, _y, _z, _heading;
private final int _mAtkSpd, _pAtkSpd;
private final int _runSpd, _walkSpd;
private final int _x;
private final int _y;
private final int _z;
private final int _heading;
private final int _mAtkSpd;
private final int _pAtkSpd;
private final int _runSpd;
private final int _walkSpd;
private final int _swimRunSpd;
private final int _swimWalkSpd;
private final int _flyRunSpd;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java
+7 -2
View File
@@ -26,8 +26,13 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
*/
public final class FlyToLocation implements IClientOutgoingPacket
{
private final int _destX, _destY, _destZ;
private final int _chaObjId, _chaX, _chaY, _chaZ;
private final int _destX;
private final int _destY;
private final int _destZ;
private final int _chaObjId;
private final int _chaX;
private final int _chaY;
private final int _chaZ;
private final FlyType _type;
public enum FlyType
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/FriendPacket.java
+2 -1
View File
@@ -28,7 +28,8 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class FriendPacket implements IClientOutgoingPacket
{
private final boolean _action, _online;
private final boolean _action;
private final boolean _online;
private final int _objid;
private final String _name;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
+6 -3
View File
@@ -24,9 +24,12 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class GMViewCharacterInfo implements IClientOutgoingPacket
{
private final L2PcInstance _activeChar;
private final int _runSpd, _walkSpd;
private final int _swimRunSpd, _swimWalkSpd;
private final int _flyRunSpd, _flyWalkSpd;
private final int _runSpd;
private final int _walkSpd;
private final int _swimRunSpd;
private final int _swimWalkSpd;
private final int _flyRunSpd;
private final int _flyWalkSpd;
private final double _moveMultiplier;
public GMViewCharacterInfo(L2PcInstance cha)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java
+5 -1
View File
@@ -24,7 +24,11 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class GetOffVehicle implements IClientOutgoingPacket
{
private final int _charObjId, _boatObjId, _x, _y, _z;
private final int _charObjId;
private final int _boatObjId;
private final int _x;
private final int _y;
private final int _z;
/**
* @param charObjId
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java
+3 -1
View File
@@ -25,7 +25,9 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class L2FriendSay implements IClientOutgoingPacket
{
private final String _sender, _receiver, _message;
private final String _sender;
private final String _receiver;
private final String _message;
public L2FriendSay(String sender, String reciever, String message)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java
+7 -1
View File
@@ -22,7 +22,13 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public final class MoveToLocation implements IClientOutgoingPacket
{
private final int _charObjId, _x, _y, _z, _xDst, _yDst, _zDst;
private final int _charObjId;
private final int _x;
private final int _y;
private final int _z;
private final int _xDst;
private final int _yDst;
private final int _zDst;
public MoveToLocation(L2Character cha)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
+6 -1
View File
@@ -25,7 +25,12 @@ public class MoveToPawn implements IClientOutgoingPacket
private final int _charObjId;
private final int _targetId;
private final int _distance;
private final int _x, _y, _z, _tx, _ty, _tz;
private final int _x;
private final int _y;
private final int _z;
private final int _tx;
private final int _ty;
private final int _tz;
public MoveToPawn(L2Character cha, L2Character target, int distance)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
+2 -1
View File
@@ -26,7 +26,8 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public final class MultiSellList implements IClientOutgoingPacket
{
private int _size, _index;
private int _size;
private int _index;
private final ListContainer _list;
private final boolean _finished;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+16 -7
View File
@@ -26,16 +26,25 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class PetInfo implements IClientOutgoingPacket
{
private final L2Summon _summon;
private final int _x, _y, _z, _heading;
private final int _x;
private final int _y;
private final int _z;
private final int _heading;
private final boolean _isSummoned;
private final int _val;
private final int _mAtkSpd, _pAtkSpd;
private final int _runSpd, _walkSpd;
private final int _swimRunSpd, _swimWalkSpd;
private final int _flyRunSpd, _flyWalkSpd;
private final int _mAtkSpd;
private final int _pAtkSpd;
private final int _runSpd;
private final int _walkSpd;
private final int _swimRunSpd;
private final int _swimWalkSpd;
private final int _flyRunSpd;
private final int _flyWalkSpd;
private final double _moveMultiplier;
private final int _maxHp, _maxMp;
private int _maxFed, _curFed;
private final int _maxHp;
private final int _maxMp;
private int _maxFed;
private int _curFed;
public PetInfo(L2Summon summon, int val)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
+2 -1
View File
@@ -29,7 +29,8 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class PetStatusUpdate implements IClientOutgoingPacket
{
private final L2Summon _summon;
private int _maxFed, _curFed;
private int _maxFed;
private int _curFed;
public PetStatusUpdate(L2Summon summon)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
+2 -1
View File
@@ -23,7 +23,8 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class RecipeShopSellList implements IClientOutgoingPacket
{
private final L2PcInstance _buyer, _manufacturer;
private final L2PcInstance _buyer;
private final L2PcInstance _manufacturer;
public RecipeShopSellList(L2PcInstance buyer, L2PcInstance manufacturer)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
+5 -1
View File
@@ -48,7 +48,11 @@ public final class RelationChanged implements IClientOutgoingPacket
protected static class Relation
{
int _objId, _relation, _autoAttackable, _karma, _pvpFlag;
int _objId;
int _relation;
int _autoAttackable;
int _karma;
int _pvpFlag;
}
private Relation _singled;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java
+6 -2
View File
@@ -27,10 +27,14 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public final class ServerObjectInfo implements IClientOutgoingPacket
{
private final L2Npc _activeChar;
private final int _x, _y, _z, _heading;
private final int _x;
private final int _y;
private final int _z;
private final int _heading;
private final int _idTemplate;
private final boolean _isAttackable;
private final double _collisionHeight, _collisionRadius;
private final double _collisionHeight;
private final double _collisionRadius;
private final String _name;
public ServerObjectInfo(L2Npc activeChar, L2Character actor)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SpecialString.java
+5 -1
View File
@@ -21,7 +21,11 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public final class SpecialString implements IClientOutgoingPacket
{
private final int _strId, _fontSize, _x, _y, _color;
private final int _strId;
private final int _fontSize;
private final int _x;
private final int _y;
private final int _color;
private final boolean _isDraw;
private final String _text;
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/StartRotation.java
+4 -1
View File
@@ -21,7 +21,10 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public final class StartRotation implements IClientOutgoingPacket
{
private final int _charObjId, _degree, _side, _speed;
private final int _charObjId;
private final int _degree;
private final int _side;
private final int _speed;
public StartRotation(int objectId, int degree, int side, int speed)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/StopRotation.java
+3 -1
View File
@@ -21,7 +21,9 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
public class StopRotation implements IClientOutgoingPacket
{
private final int _charObjId, _degree, _speed;
private final int _charObjId;
private final int _degree;
private final int _speed;
public StopRotation(int objectId, int degree, int speed)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java
+6 -3
View File
@@ -33,9 +33,12 @@ public final class UserInfo implements IClientOutgoingPacket
private int _relation;
private int _airShipHelm;
private final int _runSpd, _walkSpd;
private final int _swimRunSpd, _swimWalkSpd;
private final int _flyRunSpd, _flyWalkSpd;
private final int _runSpd;
private final int _walkSpd;
private final int _swimRunSpd;
private final int _swimWalkSpd;
private final int _flyRunSpd;
private final int _flyWalkSpd;
private final double _moveMultiplier;
public UserInfo(L2PcInstance cha)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java
+6 -1
View File
@@ -25,7 +25,12 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class VehicleDeparture implements IClientOutgoingPacket
{
private final int _objId, _x, _y, _z, _moveSpeed, _rotationSpeed;
private final int _objId;
private final int _x;
private final int _y;
private final int _z;
private final int _moveSpeed;
private final int _rotationSpeed;
/**
* @param boat
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java
+5 -1
View File
@@ -25,7 +25,11 @@ import com.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class VehicleInfo implements IClientOutgoingPacket
{
private final int _objId, _x, _y, _z, _heading;
private final int _objId;
private final int _x;
private final int _y;
private final int _z;
private final int _heading;
public VehicleInfo(L2BoatInstance boat)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/script/DateRange.java
+2 -1
View File
@@ -28,7 +28,8 @@ import java.util.logging.Logger;
public class DateRange
{
protected static final Logger LOGGER = Logger.getLogger(DateRange.class.getName());
private final Date _startDate, _endDate;
private final Date _startDate;
private final Date _endDate;
public DateRange(Date from, Date to)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+2 -1
View File
@@ -71,7 +71,8 @@ public class SecondaryPasswordAuth
private void loadPassword()
{
String var, value = null;
String var = null;
String value = null;
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement statement = con.prepareStatement(SELECT_PASSWORD))
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/taskmanager/TaskManager.java
+2 -1
View File
@@ -230,7 +230,8 @@ public final class TaskManager
private boolean launchTask(ExecutedTask task)
{
final TaskTypes type = task.getType();
long delay, interval;
long delay;
long interval;
switch (type)
{
case TYPE_STARTUP:
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/MinionList.java
+3 -1
View File
@@ -71,7 +71,9 @@ public class MinionList
return;
}
int minionCount, minionId, minionsToSpawn;
int minionCount;
int minionId;
int minionsToSpawn;
for (MinionHolder minion : minions)
{
minionCount = minion.getCount();
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/LoginController.java
+2 -1
View File
@@ -505,7 +505,8 @@ public class LoginController
ps.setString(1, info.getLogin());
try (ResultSet rset = ps.executeQuery())
{
String ip, type;
String ip;
String type;
while (rset.next())
{
ip = rset.getString("ip");
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/clientpackets/AuthGameGuard.java
+7 -1
View File
@@ -32,7 +32,13 @@ public class AuthGameGuard implements IIncomingPacket<L2LoginClient>
private int _sessionId;
@SuppressWarnings("unused")
private int _data1, _data2, _data3, _data4;
private int _data1;
@SuppressWarnings("unused")
private int _data2;
@SuppressWarnings("unused")
private int _data3;
@SuppressWarnings("unused")
private int _data4;
@Override
public boolean read(L2LoginClient client, PacketReader packet)
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/LoginOk.java
+2 -1
View File
@@ -36,7 +36,8 @@ import com.l2jmobius.loginserver.network.OutgoingPackets;
*/
public final class LoginOk implements IOutgoingPacket
{
private final int _loginOk1, _loginOk2;
private final int _loginOk1;
private final int _loginOk2;
public LoginOk(SessionKey sessionKey)
{
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/loginserver/network/serverpackets/PlayOk.java
+2 -1
View File
@@ -23,7 +23,8 @@ import com.l2jmobius.loginserver.network.OutgoingPackets;
public final class PlayOk implements IOutgoingPacket
{
private final int _playOk1, _playOk2;
private final int _playOk1;
private final int _playOk2;
public PlayOk(SessionKey sessionKey)
{