Separated multiple variable declarations.
This commit is contained in:
+2
-1
@@ -128,7 +128,8 @@ public final class Parade extends AbstractNpcAI
|
||||
public Parade()
|
||||
{
|
||||
// Starts at 8:00 and repeats every 6 hours.
|
||||
final long diff = timeLeftMilli(8, 0, 0), cycle = 3600000;
|
||||
final long diff = timeLeftMilli(8, 0, 0);
|
||||
final long cycle = 3600000;
|
||||
ThreadPool.scheduleAtFixedRate(new Start(), diff, cycle);
|
||||
|
||||
// Test - Starts 3 minutes after server startup and repeats every 20 minutes.
|
||||
|
||||
+2
-1
@@ -287,7 +287,8 @@ public final class TalentShow extends AbstractNpcAI
|
||||
final int gameTime = GameTimeController.getInstance().getGameTime();
|
||||
final int hours = (gameTime / 60) % 24;
|
||||
final int minutes = gameTime % 60;
|
||||
int hourDiff, minDiff;
|
||||
int hourDiff;
|
||||
int minDiff;
|
||||
hourDiff = 20 - hours;
|
||||
if (hourDiff < 0)
|
||||
{
|
||||
|
||||
+3
-1
@@ -57,7 +57,9 @@ public class HeartInfinityDefence extends AbstractNpcAI
|
||||
public List<L2Npc> deadTumors = new ArrayList<>();
|
||||
protected L2Npc deadTumor;
|
||||
public long startTime = 0;
|
||||
protected ScheduledFuture<?> finishTask = null, timerTask = null, wagonSpawnTask = null;
|
||||
protected ScheduledFuture<?> finishTask = null;
|
||||
protected ScheduledFuture<?> timerTask = null;
|
||||
protected ScheduledFuture<?> wagonSpawnTask = null;
|
||||
|
||||
public HIDWorld()
|
||||
{
|
||||
|
||||
+2
-1
@@ -264,7 +264,8 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
|
||||
private static Map<L2Clan, Integer> _pendingItemToGet = new HashMap<>();
|
||||
|
||||
protected static SiegableHall _rainbow;
|
||||
protected static ScheduledFuture<?> _nextSiege, _siegeEnd;
|
||||
protected static ScheduledFuture<?> _nextSiege;
|
||||
protected static ScheduledFuture<?> _siegeEnd;
|
||||
private static String _registrationEnds;
|
||||
|
||||
public RainbowSpringsChateau()
|
||||
|
||||
Vendored
+3
-1
@@ -279,7 +279,9 @@ public final class NpcLocationInfo extends AbstractNpcAI
|
||||
|
||||
if (CommonUtil.contains(NPCRADAR, npcId))
|
||||
{
|
||||
int x = 0, y = 0, z = 0;
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
int z = 0;
|
||||
final L2Spawn spawn = SpawnTable.getInstance().getAnySpawn(npcId);
|
||||
if (spawn != null)
|
||||
{
|
||||
|
||||
+4
-2
@@ -144,8 +144,10 @@ public final class SubClassSkills extends AbstractNpcAI
|
||||
st = newQuestState(player);
|
||||
}
|
||||
|
||||
String qName, qValue;
|
||||
int id, index;
|
||||
String qName;
|
||||
String qValue;
|
||||
int id;
|
||||
int index;
|
||||
for (int i = VARS.length; --i >= 0;)
|
||||
{
|
||||
for (int j = Config.MAX_SUBCLASS; j > 0; j--)
|
||||
|
||||
Vendored
+4
-2
@@ -771,7 +771,8 @@ public class AdminEditChar implements IAdminCommandHandler
|
||||
{
|
||||
final String val = command.substring(20);
|
||||
final int level = Integer.parseInt(val);
|
||||
long newexp, oldexp = 0;
|
||||
long newexp = 0;
|
||||
long oldexp = 0;
|
||||
oldexp = pet.getStat().getExp();
|
||||
newexp = pet.getStat().getExpForLevel(level);
|
||||
if (oldexp > newexp)
|
||||
@@ -1230,7 +1231,8 @@ public class AdminEditChar implements IAdminCommandHandler
|
||||
|
||||
int CharactersFound = 0;
|
||||
L2GameClient client;
|
||||
String name, ip = "0.0.0.0";
|
||||
String name;
|
||||
String ip = "0.0.0.0";
|
||||
final StringBuilder replyMSG = new StringBuilder(1000);
|
||||
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
|
||||
adminReply.setFile(activeChar, "data/html/admin/ipfind.htm");
|
||||
|
||||
Vendored
+2
-1
@@ -509,7 +509,8 @@ public class AdminEffects implements IAdminCommandHandler
|
||||
try
|
||||
{
|
||||
L2Object obj = activeChar.getTarget();
|
||||
int level = 1, hittime = 1;
|
||||
int level = 1;
|
||||
int hittime = 1;
|
||||
final int skill = Integer.parseInt(st.nextToken());
|
||||
if (st.hasMoreTokens())
|
||||
{
|
||||
|
||||
Vendored
+2
-1
@@ -139,7 +139,8 @@ public class AdminElement implements IAdminCommandHandler
|
||||
|
||||
if (itemInstance != null)
|
||||
{
|
||||
String old, current;
|
||||
String old;
|
||||
String current;
|
||||
final Elementals element = itemInstance.getElemental(type);
|
||||
if (element == null)
|
||||
{
|
||||
|
||||
Vendored
+4
-1
@@ -178,7 +178,10 @@ public class AdminQuest implements IAdminCommandHandler
|
||||
{
|
||||
final String questName = command.substring("admin_quest_info ".length());
|
||||
final Quest quest = QuestManager.getInstance().getQuest(questName);
|
||||
String events = "", npcs = "", items = "", timers = "";
|
||||
String events = "";
|
||||
String npcs = "";
|
||||
String items = "";
|
||||
String timers = "";
|
||||
int counter = 0;
|
||||
if (quest == null)
|
||||
{
|
||||
|
||||
Vendored
+3
-1
@@ -208,7 +208,9 @@ public class AdminTeleport implements IAdminCommandHandler
|
||||
else if (command.startsWith("admin_go"))
|
||||
{
|
||||
int intVal = 150;
|
||||
int x = activeChar.getX(), y = activeChar.getY(), z = activeChar.getZ();
|
||||
int x = activeChar.getX();
|
||||
int y = activeChar.getY();
|
||||
int z = activeChar.getZ();
|
||||
try
|
||||
{
|
||||
final String val = command.substring(8);
|
||||
|
||||
Vendored
+2
-1
@@ -38,7 +38,8 @@ public class VoiceCommand implements IBypassHandler
|
||||
// only voice commands allowed
|
||||
if ((command.length() > 7) && (command.charAt(6) == '.'))
|
||||
{
|
||||
final String vc, vparams;
|
||||
final String vc;
|
||||
final String vparams;
|
||||
final int endOfCommand = command.indexOf(" ", 7);
|
||||
if (endOfCommand > 0)
|
||||
{
|
||||
|
||||
Vendored
+2
-1
@@ -253,7 +253,8 @@ public class Debug implements ITelnetCommand
|
||||
|
||||
static String getServerStatus()
|
||||
{
|
||||
int playerCount = 0, objectCount = 0;
|
||||
int playerCount = 0;
|
||||
int objectCount = 0;
|
||||
final int max = LoginServerThread.getInstance().getMaxPlayer();
|
||||
|
||||
playerCount = L2World.getInstance().getPlayers().size();
|
||||
|
||||
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java
Vendored
+3
-1
@@ -43,7 +43,9 @@ public class ChangePassword implements IVoicedCommandHandler
|
||||
final StringTokenizer st = new StringTokenizer(target);
|
||||
try
|
||||
{
|
||||
String curpass = null, newpass = null, repeatnewpass = null;
|
||||
String curpass = null;
|
||||
String newpass = null;
|
||||
String repeatnewpass = null;
|
||||
if (st.hasMoreTokens())
|
||||
{
|
||||
curpass = st.nextToken();
|
||||
|
||||
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
Vendored
+2
-1
@@ -396,7 +396,8 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm
|
||||
if ("point".equalsIgnoreCase(cd.getNodeName()))
|
||||
{
|
||||
attrs = cd.getAttributes();
|
||||
int x, y;
|
||||
int x;
|
||||
int y;
|
||||
att = attrs.getNamedItem("x");
|
||||
if (att != null)
|
||||
{
|
||||
|
||||
Vendored
+6
-2
@@ -381,7 +381,9 @@ public class Q00255_Tutorial extends Quest
|
||||
}
|
||||
else if ((event_id == 8) && (player.getLevel() < 6))
|
||||
{
|
||||
int x = 0, y = 0, z = 0;
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
int z = 0;
|
||||
for (String[] element : CEEa)
|
||||
{
|
||||
if (classId == Integer.valueOf(element[0]))
|
||||
@@ -557,7 +559,9 @@ public class Q00255_Tutorial extends Quest
|
||||
// Question mark clicked
|
||||
else if (event.startsWith("QM"))
|
||||
{
|
||||
int x = 0, y = 0, z = 0;
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
int z = 0;
|
||||
switch (Integer.valueOf(event.substring(2)))
|
||||
{
|
||||
case 1:
|
||||
|
||||
Vendored
+2
-1
@@ -228,7 +228,8 @@ public final class Q00378_GrandFeast extends Quest
|
||||
if (hasQuestItems(player, RITRONS_DESSERT_RECIPE))
|
||||
{
|
||||
takeItems(player, RITRONS_DESSERT_RECIPE, 1);
|
||||
int item = 0, adena = 0;
|
||||
int item = 0;
|
||||
int adena = 0;
|
||||
long quantity = 0;
|
||||
switch (qs.getMemoStateEx(1))
|
||||
{
|
||||
|
||||
Vendored
+2
-1
@@ -152,7 +152,8 @@ public class Q00700_CursedLife extends Quest
|
||||
{
|
||||
if (npc.getId() == ROK)
|
||||
{
|
||||
int amount = 0, chance = getRandom(1000);
|
||||
int amount = 0;
|
||||
int chance = getRandom(1000);
|
||||
if (chance < 700)
|
||||
{
|
||||
amount = 1;
|
||||
|
||||
+2
-1
@@ -432,7 +432,8 @@ public class TerritoryWarSuperClass extends Quest
|
||||
|
||||
private static void handleBecomeMercenaryQuest(L2PcInstance player, boolean catapult)
|
||||
{
|
||||
int enemyCount = 10, catapultCount = 1;
|
||||
int enemyCount = 10;
|
||||
int catapultCount = 1;
|
||||
QuestState st = player.getQuestState(Q00147_PathtoBecominganEliteMercenary.class.getSimpleName());
|
||||
if ((st != null) && st.isCompleted())
|
||||
{
|
||||
|
||||
+4
-1
@@ -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;
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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()
|
||||
{
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
+2
-1
@@ -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"))
|
||||
|
||||
+5
-1
@@ -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]);
|
||||
|
||||
+4
-1
@@ -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"));
|
||||
|
||||
+64
-8
@@ -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())
|
||||
{
|
||||
|
||||
+3
-1
@@ -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();
|
||||
|
||||
+10
-3
@@ -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())
|
||||
{
|
||||
|
||||
+3
-1
@@ -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:
|
||||
|
||||
+5
-2
@@ -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())
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -63,7 +63,8 @@ public class SeedProduction
|
||||
|
||||
public final boolean decreaseAmount(long val)
|
||||
{
|
||||
long current, next;
|
||||
long current;
|
||||
long next;
|
||||
do
|
||||
{
|
||||
current = _amount.get();
|
||||
|
||||
+2
-1
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
+13
-4
@@ -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;
|
||||
|
||||
+3
-1
@@ -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;
|
||||
|
||||
|
||||
+2
-1
@@ -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);
|
||||
|
||||
+7
-4
@@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+3
-1
@@ -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;
|
||||
|
||||
+2
-1
@@ -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;
|
||||
|
||||
+7
-2
@@ -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];
|
||||
|
||||
+3
-1
@@ -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;)
|
||||
|
||||
+7
-3
@@ -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();
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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())
|
||||
|
||||
+8
-1
@@ -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()))
|
||||
{
|
||||
|
||||
+4
-2
@@ -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;
|
||||
|
||||
+12
-3
@@ -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;
|
||||
|
||||
|
||||
+2
-1
@@ -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];
|
||||
|
||||
+2
-1
@@ -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)
|
||||
|
||||
+10
-7
@@ -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));
|
||||
}
|
||||
|
||||
+4
-5
@@ -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))
|
||||
|
||||
@@ -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);
|
||||
|
||||
+2
-1
@@ -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);
|
||||
|
||||
+2
-1
@@ -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
|
||||
|
||||
+2
-1
@@ -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);
|
||||
|
||||
+2
-1
@@ -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)
|
||||
|
||||
+4
-1
@@ -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)
|
||||
|
||||
+1
-5
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
+4
-2
@@ -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)
|
||||
|
||||
+3
-1
@@ -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)
|
||||
|
||||
+2
-1
@@ -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;
|
||||
|
||||
+2
-1
@@ -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());
|
||||
|
||||
+2
-1
@@ -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)
|
||||
|
||||
+3
-1
@@ -76,7 +76,9 @@ public class ValidatePosition implements IClientIncomingPacket
|
||||
}
|
||||
}
|
||||
|
||||
int dx, dy, dz;
|
||||
int dx;
|
||||
int dy;
|
||||
int dz;
|
||||
double diffSq;
|
||||
|
||||
if (activeChar.isInBoat())
|
||||
|
||||
+20
-8
@@ -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;
|
||||
|
||||
+3
-1
@@ -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);
|
||||
|
||||
+3
-1
@@ -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;
|
||||
|
||||
+8
-4
@@ -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;
|
||||
|
||||
+2
-1
@@ -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)
|
||||
{
|
||||
|
||||
+8
-1
@@ -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)
|
||||
{
|
||||
|
||||
+5
-1
@@ -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)
|
||||
{
|
||||
|
||||
+3
-1
@@ -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
|
||||
|
||||
+7
-1
@@ -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)
|
||||
{
|
||||
|
||||
+4
-1
@@ -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)
|
||||
|
||||
+5
-2
@@ -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)
|
||||
{
|
||||
|
||||
+5
-1
@@ -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)
|
||||
{
|
||||
|
||||
+2
-1
@@ -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)
|
||||
|
||||
+3
-1
@@ -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;
|
||||
|
||||
/**
|
||||
|
||||
+7
-1
@@ -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)
|
||||
{
|
||||
|
||||
+2
-1
@@ -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)
|
||||
|
||||
+2
-1
@@ -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)
|
||||
{
|
||||
|
||||
+5
-1
@@ -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)
|
||||
{
|
||||
|
||||
+4
-1
@@ -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)
|
||||
{
|
||||
|
||||
+2
-1
@@ -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)
|
||||
{
|
||||
|
||||
+5
-1
@@ -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)
|
||||
{
|
||||
|
||||
+8
-3
@@ -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;
|
||||
|
||||
+7
-2
@@ -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
|
||||
|
||||
+2
-1
@@ -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;
|
||||
|
||||
|
||||
+6
-3
@@ -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)
|
||||
|
||||
+5
-1
@@ -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
|
||||
|
||||
+3
-1
@@ -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)
|
||||
{
|
||||
|
||||
+7
-1
@@ -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)
|
||||
{
|
||||
|
||||
+6
-1
@@ -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)
|
||||
{
|
||||
|
||||
+2
-1
@@ -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;
|
||||
|
||||
|
||||
+16
-7
@@ -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)
|
||||
{
|
||||
|
||||
+2
-1
@@ -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)
|
||||
{
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user