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_C6_Interlude/java/com/l2jmobius/Config.java
+3 -1
View File
@@ -1053,7 +1053,9 @@ public final class Config
public static float ALT_DAGGER_DMG_VS_HEAVY;
public static float ALT_DAGGER_DMG_VS_ROBE;
public static float ALT_DAGGER_DMG_VS_LIGHT;
public static boolean ALLOW_RAID_LETHAL, ALLOW_LETHAL_PROTECTION_MOBS;
public static boolean ALLOW_RAID_LETHAL;
public static boolean ALLOW_LETHAL_PROTECTION_MOBS;
public static String LETHAL_PROTECTED_MOBS;
public static List<Integer> LIST_LETHAL_PROTECTED_MOBS = new ArrayList<>();
public static float MAGIC_CRITICAL_POWER;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/crypt/BlowfishEngine.java
+4 -1
View File
@@ -1091,7 +1091,10 @@ public 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;
private final int[] S2;
private final int[] S3;
private final int[] P; // the p-array
private boolean encrypting = false;
private byte[] workingKey = null;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/util/Point3D.java
+7 -3
View File
@@ -24,7 +24,9 @@ import java.io.Serializable;
*/
public class Point3D implements Serializable
{
private volatile int _x, _y, _z;
private volatile int _x;
private volatile int _y;
private volatile int _z;
public Point3D(int pX, int pY, int pZ)
{
@@ -98,7 +100,8 @@ public class Point3D implements Serializable
public synchronized long distanceSquaredTo(Point3D point)
{
long dx, dy;
long dx;
long dy;
synchronized (point)
{
dx = _x - point._x;
@@ -109,7 +112,8 @@ public class Point3D implements Serializable
public static long distanceSquared(Point3D point1, Point3D point2)
{
long dx, dy;
long dx;
long dy;
synchronized (point1)
{
synchronized (point2)
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
+6 -2
View File
@@ -553,7 +553,9 @@ public class L2AttackableAI extends L2CharacterAI
if (_actor.getPlanDistanceSq(((L2MinionInstance) _actor).getLeader()) > (offset * offset))
{
int x1, y1, z1;
int x1;
int y1;
int z1;
x1 = (((L2MinionInstance) _actor).getLeader().getX() + Rnd.nextInt((offset - 30) * 2)) - (offset - 30);
y1 = (((L2MinionInstance) _actor).getLeader().getY() + Rnd.nextInt((offset - 30) * 2)) - (offset - 30);
@@ -566,7 +568,9 @@ public class L2AttackableAI extends L2CharacterAI
// Order to the L2MonsterInstance to random walk (1/100)
else if (!(npc instanceof L2ChestInstance) && (npc.getSpawn() != null) && (Rnd.nextInt(RANDOM_WALK_RATE) == 0))
{
int x1, y1, z1;
int x1;
int y1;
int z1;
// If NPC with random coord in territory
if ((npc.getSpawn().getX() == 0) && (npc.getSpawn().getY() == 0))
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java
+6 -2
View File
@@ -432,8 +432,12 @@ public class L2ControllableMobAI extends L2AttackableAI
L2Attackable npc = (L2Attackable) _actor;
int npcX, npcY, targetX, targetY;
double dy, dx;
int npcX;
int npcY;
int targetX;
int targetY;
double dy;
double dx;
final double dblAggroRange = aggroRange * aggroRange;
final List<L2Character> potentialTarget = new ArrayList<>();
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2NpcWalkerAI.java
+11 -1
View File
@@ -37,7 +37,17 @@ public class L2NpcWalkerAI extends L2CharacterAI implements Runnable
/**
* home points for xyz
*/
int _homeX, _homeY, _homeZ;
int _homeX;
/**
* home points for xyz
*/
int _homeY;
/**
* home points for xyz
*/
int _homeZ;
/**
* route of the current npc
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2PlayerAI.java
+2 -1
View File
@@ -43,7 +43,8 @@ public class L2PlayerAI extends L2CharacterAI
class IntentionCommand
{
protected CtrlIntention _crtlIntention;
protected Object _arg0, _arg1;
protected Object _arg0;
protected Object _arg1;
protected IntentionCommand(CtrlIntention pIntention, Object pArg0, Object pArg1)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
+3 -1
View File
@@ -365,7 +365,9 @@ public class MailBBSManager extends BaseBBSManager
}
activeChar.setMailPosition(page);
int index = 0, minIndex = 0, maxIndex = 0;
int index = 0;
int minIndex = 0;
int maxIndex = 0;
maxIndex = (page == 1 ? page * 9 : (page * 10) - 1);
minIndex = maxIndex - 9;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/csv/ExtractableItemsData.java
+3 -1
View File
@@ -99,7 +99,9 @@ public class ExtractableItemsData
continue;
}
int production = 0, amount = 0, chance = 0;
int production = 0;
int amount = 0;
int chance = 0;
try
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/csv/SummonItemsData.java
+2 -1
View File
@@ -73,7 +73,8 @@ public class SummonItemsData
final String[] lineSplit = line.split(";");
boolean ok = true;
int itemID = 0, npcID = 0;
int itemID = 0;
int npcID = 0;
byte summonType = 0;
try
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/L2PetDataTable.java
+2 -1
View File
@@ -57,7 +57,8 @@ public class L2PetDataTable
final PreparedStatement statement = con.prepareStatement("SELECT typeID, level, expMax, hpMax, mpMax, patk, pdef, matk, mdef, acc, evasion, crit, speed, atk_speed, cast_speed, feedMax, feedbattle, feednormal, loadMax, hpregen, mpregen, owner_exp_taken FROM pets_stats");
final ResultSet rset = statement.executeQuery();
int petId, petLevel;
int petId;
int petLevel;
while (rset.next())
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/AugmentationData.java
+2 -1
View File
@@ -365,7 +365,8 @@ public class AugmentationData
NamedNodeMap attrs = d.getAttributes();
String statName = attrs.getNamedItem("name").getNodeValue();
float soloValues[] = null, combinedValues[] = null;
float soloValues[] = null;
float combinedValues[] = null;
for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling())
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/xml/ZoneData.java
+4 -1
View File
@@ -526,7 +526,10 @@ public class ZoneData
// Register the zone into any world region it intersects with...
// currently 11136 test for each zone :>
int ax, ay, bx, by;
int ax;
int ay;
int bx;
int by;
for (int x = 0; x < worldRegions.length; x++)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/engines/DocumentBase.java
+4 -2
View File
@@ -242,7 +242,8 @@ public abstract class DocumentBase
{
final NamedNodeMap attrs = n.getAttributes();
final String name = attrs.getNamedItem("name").getNodeValue();
int time, count = 1;
int time;
int count = 1;
int showIcon = 0;
if (attrs.getNamedItem("noicon") != null)
{
@@ -381,7 +382,8 @@ public abstract class DocumentBase
{
final NamedNodeMap attrs = n.getAttributes();
int id = 0, lvl = 1;
int id = 0;
int lvl = 1;
if (attrs.getNamedItem("id") != null)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java
+5 -2
View File
@@ -187,7 +187,9 @@ public class CellPathFinding extends PathFinding
_postFilterPlayableUses++;
}
int currentX, currentY, currentZ;
int currentX;
int currentY;
int currentZ;
ListIterator<AbstractNodeLoc> middlePoint;
boolean remove;
int pass = 0;
@@ -246,7 +248,8 @@ public class CellPathFinding extends PathFinding
final LinkedList<AbstractNodeLoc> path = new LinkedList<>();
int previousDirectionX = Integer.MIN_VALUE;
int previousDirectionY = Integer.MIN_VALUE;
int directionX, directionY;
int directionX;
int directionY;
while (node.getParent() != null)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java
+7 -3
View File
@@ -130,7 +130,8 @@ public class GeoPathFinding extends PathFinding
final int targetX = end.getLoc().getNodeX();
final int targetY = end.getLoc().getNodeY();
int dx, dy;
int dx;
int dy;
boolean added;
int i = 0;
while (i < 550)
@@ -224,7 +225,8 @@ public class GeoPathFinding extends PathFinding
final List<AbstractNode<GeoNodeLoc>> Neighbors = new ArrayList<>(8);
GeoNode newNode;
short new_node_x, new_node_y;
short new_node_x;
short new_node_y;
// Region for sure will change, we must read from correct file
byte neighbor = pn.get(idx++); // N
@@ -426,7 +428,9 @@ public class GeoPathFinding extends PathFinding
final short regionoffset = getRegionOffset(rx, ry);
final File file = new File(Config.PATHNODE_DIR, rx + "_" + ry + ".pn");
_log.info("Path Engine: - Loading: " + file.getName() + " -> region offset: " + regionoffset + " X: " + rx + " Y: " + ry);
int node = 0, size, index = 0;
int node = 0;
int size;
int index = 0;
// Create a read-only memory-mapped file
try (RandomAccessFile raf = new RandomAccessFile(file, "r");
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java
+4 -2
View File
@@ -880,7 +880,8 @@ public class AdminEditChar implements IAdminCommandHandler
if (target != null)
{
final String[] tokens = command.split(" ");
boolean param = true, save = false;
boolean param = true;
boolean save = false;
if (tokens.length == 2)
{
param = Boolean.parseBoolean(tokens[1]);
@@ -1332,7 +1333,8 @@ public class AdminEditChar implements IAdminCommandHandler
int CharactersFound = 0;
String name, ip = "0.0.0.0";
String name;
String ip = "0.0.0.0";
StringBuilder replyMSG = new StringBuilder();
NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
adminReply.setFile("data/html/admin/ipfind.htm");
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java
+12 -5
View File
@@ -244,7 +244,8 @@ public class AdminEditNpc implements IAdminCommandHandler
}
else if (command.startsWith("admin_edit_skill_npc "))
{
int npcId = -1, skillId = -1;
int npcId = -1;
int skillId = -1;
try
{
final StringTokenizer st = new StringTokenizer(command.substring(21).trim(), " ");
@@ -287,7 +288,8 @@ public class AdminEditNpc implements IAdminCommandHandler
}
else if (command.startsWith("admin_add_skill_npc "))
{
int npcId = -1, skillId = -1;
int npcId = -1;
int skillId = -1;
try
{
final StringTokenizer st = new StringTokenizer(command.substring(20).trim(), " ");
@@ -339,7 +341,8 @@ public class AdminEditNpc implements IAdminCommandHandler
}
else if (command.startsWith("admin_del_skill_npc "))
{
int npcId = -1, skillId = -1;
int npcId = -1;
int skillId = -1;
try
{
final String[] input = command.substring(20).split(" ");
@@ -364,7 +367,9 @@ public class AdminEditNpc implements IAdminCommandHandler
}
else if (command.startsWith("admin_edit_drop "))
{
int npcId = -1, itemId = 0, category = -1000;
int npcId = -1;
int itemId = 0;
int category = -1000;
try
{
StringTokenizer st = new StringTokenizer(command.substring(16).trim());
@@ -468,7 +473,9 @@ public class AdminEditNpc implements IAdminCommandHandler
}
else if (command.startsWith("admin_del_drop "))
{
int npcId = -1, itemId = -1, category = -1000;
int npcId = -1;
int itemId = -1;
int category = -1000;
try
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java
+2 -1
View File
@@ -644,7 +644,8 @@ public class AdminEffects implements IAdminCommandHandler
{
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())
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminMammon.java
+6 -2
View File
@@ -86,7 +86,9 @@ public class AdminMammon implements IAdminCommandHandler
L2NpcInstance[] blackInst = blackSpawnInst.getNPCInstanceList();
if (blackInst.length > 0)
{
final int x1 = blackInst[0].getX(), y1 = blackInst[0].getY(), z1 = blackInst[0].getZ();
final int x1 = blackInst[0].getX();
final int y1 = blackInst[0].getY();
final int z1 = blackInst[0].getZ();
BuilderUtil.sendSysMessage(activeChar, "Blacksmith of Mammon: " + x1 + " " + y1 + " " + z1);
if (teleportIndex == 1)
@@ -106,7 +108,9 @@ public class AdminMammon implements IAdminCommandHandler
if (merchInst.length > 0)
{
final int x2 = merchInst[0].getX(), y2 = merchInst[0].getY(), z2 = merchInst[0].getZ();
final int x2 = merchInst[0].getX();
final int y2 = merchInst[0].getY();
final int z2 = merchInst[0].getZ();
BuilderUtil.sendSysMessage(activeChar, "Merchant of Mammon: " + x2 + " " + y2 + " " + z2);
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java
+6 -2
View File
@@ -100,7 +100,9 @@ public class AdminMenu implements IAdminCommandHandler
}
else if (command.startsWith("admin_recall_party_menu"))
{
final int x = activeChar.getX(), y = activeChar.getY(), z = activeChar.getZ();
final int x = activeChar.getX();
final int y = activeChar.getY();
final int z = activeChar.getZ();
try
{
@@ -131,7 +133,9 @@ public class AdminMenu implements IAdminCommandHandler
}
else if (command.startsWith("admin_recall_clan_menu"))
{
final int x = activeChar.getX(), y = activeChar.getY(), z = activeChar.getZ();
final int x = activeChar.getX();
final int y = activeChar.getY();
final int z = activeChar.getZ();
try
{
String targetName = command.substring(23);
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java
+3 -1
View File
@@ -396,7 +396,9 @@ public class AdminTeleport implements IAdminCommandHandler
case admin_godown:
{
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
{
String val = command.substring(8);
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTownWar.java
+6 -2
View File
@@ -90,7 +90,9 @@ public class AdminTownWar implements IAdminCommandHandler
final Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers();
{
int x, y, z;
int x;
int y;
int z;
L2TownZone Town;
for (L2PcInstance onlinePlayer : pls)
@@ -169,7 +171,9 @@ public class AdminTownWar implements IAdminCommandHandler
final Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers();
{
int xx, yy, zz;
int xx;
int yy;
int zz;
L2TownZone Town;
for (L2PcInstance onlinePlayer : pls)
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/itemhandlers/ExtractableItems.java
+2 -1
View File
@@ -59,7 +59,8 @@ public class ExtractableItems implements IItemHandler
{
return;
}
int createItemID = 0, createAmount = 0;
int createItemID = 0;
int createAmount = 0;
final int rndNum = Rnd.get(100);
int chanceFrom = 0;
for (L2ExtractableProductItem expi : exitem.getProductItems())
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/ChristmasManager.java
+51 -47
View File
@@ -125,51 +125,51 @@ public class ChristmasManager
"I wish everybody a Merry Christmas! May the Holy Spirit be with you all the time.",
"May you have the best of Christmas this year and all your dreams come true.",
"May the miracle of Christmas fill your heart with warmth and love. Merry Christmas!"
},
sender =
{
"Santa Claus",
"Papai Noel",
"Shengdan Laoren",
"Santa",
"Viejo Pascuero",
"Sinter Klaas",
"Father Christmas",
"Saint Nicholas",
"Joulupukki",
"Pere Noel",
"Saint Nikolaus",
"Kanakaloka",
"De Kerstman",
"Winter grandfather",
"Babbo Natale",
"Hoteiosho",
"Kaledu Senelis",
"Black Peter",
"Kerstman",
"Julenissen",
"Swiety Mikolaj",
"Ded Moroz",
"Julenisse",
"El Nino Jesus",
"Jultomten",
"Reindeer Dasher",
"Reindeer Dancer",
"Christmas Spirit",
"Reindeer Prancer",
"Reindeer Vixen",
"Reindeer Comet",
"Reindeer Cupid",
"Reindeer Donner",
"Reindeer Donder",
"Reindeer Dunder",
"Reindeer Blitzen",
"Reindeer Bliksem",
"Reindeer Blixem",
"Reindeer Rudolf",
"Christmas Elf"
};
};
protected String[] sender =
{
"Santa Claus",
"Papai Noel",
"Shengdan Laoren",
"Santa",
"Viejo Pascuero",
"Sinter Klaas",
"Father Christmas",
"Saint Nicholas",
"Joulupukki",
"Pere Noel",
"Saint Nikolaus",
"Kanakaloka",
"De Kerstman",
"Winter grandfather",
"Babbo Natale",
"Hoteiosho",
"Kaledu Senelis",
"Black Peter",
"Kerstman",
"Julenissen",
"Swiety Mikolaj",
"Ded Moroz",
"Julenisse",
"El Nino Jesus",
"Jultomten",
"Reindeer Dasher",
"Reindeer Dancer",
"Christmas Spirit",
"Reindeer Prancer",
"Reindeer Vixen",
"Reindeer Comet",
"Reindeer Cupid",
"Reindeer Donner",
"Reindeer Donder",
"Reindeer Dunder",
"Reindeer Blitzen",
"Reindeer Bliksem",
"Reindeer Blixem",
"Reindeer Rudolf",
"Christmas Elf"
};
// Presents List:
protected int[] presents =
@@ -243,7 +243,9 @@ public class ChristmasManager
};
// The message task sent at fixed rate
protected Future<?> _XMasMessageTask = null, _XMasPresentsTask = null;
protected Future<?> _XMasMessageTask = null;
protected Future<?> _XMasPresentsTask = null;
// Manager should only be Initialized once:
protected int isManagerInit = 0;
@@ -251,7 +253,9 @@ public class ChristmasManager
// Interval of Christmas actions:
protected long _IntervalOfChristmas = 600000; // 10 minutes
private final int first = 25000, last = 73099;
private final int first = 25000;
private final int last = 73099;
/************************************** Initial Functions **************************************/
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java
+7 -2
View File
@@ -66,8 +66,13 @@ public class ClanHallManager
LOGGER.info("Initializing ClanHallManager");
try (Connection con = DatabaseFactory.getConnection())
{
int id, ownerId, lease, grade = 0;
String Name, Desc, Location;
int id;
int ownerId;
int lease;
int grade = 0;
String Name;
String Desc;
String Location;
long paidUntil = 0;
boolean paid = false;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/DimensionalRiftManager.java
+10 -3
View File
@@ -162,7 +162,8 @@ public class DimensionalRiftManager
public void loadSpawns()
{
int countGood = 0, countBad = 0;
int countGood = 0;
int countBad = 0;
try
{
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -178,8 +179,14 @@ public 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;
L2Spawn spawnDat;
L2NpcTemplate template;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java
+3 -1
View File
@@ -698,7 +698,9 @@ public class MercTicketManager
int npcId;
int itemId;
int x, y, z;
int x;
int y;
int z;
// start index to begin the search for the itemId corresponding to this NPC
// this will help with:
// a) skip unnecessary iterations in the search loop
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Radar.java
+6 -2
View File
@@ -71,7 +71,10 @@ public final class L2Radar
private 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 x, int y, int z)
{
@@ -104,7 +107,8 @@ public final class L2Radar
public class RadarOnPlayer implements Runnable
{
private final L2PcInstance _myTarget, _me;
private final L2PcInstance _myTarget;
private final L2PcInstance _me;
public RadarOnPlayer(L2PcInstance target, L2PcInstance me)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Territory.java
+5 -1
View File
@@ -27,7 +27,11 @@ public class L2Territory
protected 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_C6_Interlude/java/com/l2jmobius/gameserver/model/L2TradeList.java
+2 -2
View File
@@ -35,8 +35,8 @@ public class L2TradeList
private final int _listId;
private boolean _confirmed;
private boolean _gm;
private String _buystorename, _sellstorename;
private String _buystorename;
private String _sellstorename;
private String _npcId;
public L2TradeList(int listId)
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2WorldRegion.java
+2 -4
View File
@@ -50,15 +50,13 @@ public final class L2WorldRegion
* L2ObjectHashSet(L2PlayableInstance) containing L2PlayableInstance of all player & summon in game in this L2WorldRegion
*/
private final L2ObjectSet<L2Playable> _allPlayable;
/** L2ObjectHashSet(L2Object) containing L2Object visible in this L2WorldRegion */
private final L2ObjectSet<L2Object> _visibleObjects;
private final List<L2WorldRegion> _surroundingRegions;
private final int _tileX, _tileY;
private final int _tileX;
private final int _tileY;
private Boolean _active = false;
private ScheduledFuture<?> _neighborsTask = null;
private L2ZoneManager _zoneManager;
public L2WorldRegion(int pTileX, int pTileY)
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/TradeList.java
+2 -1
View File
@@ -555,7 +555,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_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
+9 -4
View File
@@ -651,7 +651,8 @@ public class L2Attackable extends L2NpcInstance
long damage;
L2Character attacker, ddealer;
L2Character attacker;
L2Character ddealer;
// While Interacting over This Map Removing Object is Not Allowed
synchronized (_aggroList)
@@ -724,9 +725,13 @@ public class L2Attackable extends L2NpcInstance
if (!rewards.isEmpty())
{
L2Party attackerParty;
long exp, partyDmg;
int levelDiff, partyLvl, sp;
float partyMul, penalty;
long exp;
long partyDmg;
int levelDiff;
int partyLvl;
int sp;
float partyMul;
float penalty;
RewardInfo reward2;
int[] tmp;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+19 -6
View File
@@ -806,7 +806,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
{
if (Config.TW_DISABLE_GK)
{
int x1, y1, z1;
int x1;
int y1;
int z1;
x1 = getX();
y1 = getY();
z1 = getZ();
@@ -1556,7 +1558,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
{
boolean hitted = false;
double angleChar, angleTarget;
double angleChar;
double angleTarget;
final int maxRadius = (int) getStat().calcStat(Stats.POWER_ATTACK_RANGE, 66, null, null);
final int maxAngleDiff = (int) getStat().calcStat(Stats.POWER_ATTACK_ANGLE, 120, null, null);
@@ -5986,7 +5989,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
final int yPrev = getY();
int zPrev = getZ(); // the z coordinate may be modified by coordinate synchronizations
double dx, dy, dz, distFraction;
double dx;
double dy;
double dz;
double distFraction;
// the only method that can modify x,y while moving (otherwise _move would/should be set null)
if (Config.COORD_SYNCHRONIZE == 1)
{
@@ -9468,7 +9474,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
*/
public boolean isBehind(L2Object target)
{
double angleChar, angleTarget, angleDiff; //
double angleChar; //
double angleTarget;
double angleDiff;
final double maxAngleDiff = 40;
if (target == null)
@@ -9527,7 +9535,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
*/
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;
@@ -9559,7 +9570,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
*/
public boolean isFront(L2Object target)
{
double angleChar, angleTarget, angleDiff;
double angleChar;
double angleTarget;
double angleDiff;
final double maxAngleDiff = 40;
if (target == null)
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java
+3 -1
View File
@@ -1096,7 +1096,9 @@ public class L2CubicInstance
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_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java
+10 -3
View File
@@ -138,13 +138,20 @@ public class L2NpcInstance extends L2Character
/** The fortress index in the array of L2Fort this L2NpcInstance belongs to. */
private int _fortIndex = -2;
/** The _is ct f_ flag. */
public boolean isEventMob = false, _isEventMobTvT = false, _isEventVIPNPC = false, _isEventVIPNPCEnd = false, _isEventMobDM = false, _isEventMobCTF = false, _isCTF_throneSpawn = false, _isCTF_Flag = false;
/** Ctf. */
public boolean isEventMob = false;
public boolean _isEventMobTvT = false;
public boolean _isEventVIPNPC = false;
public boolean _isEventVIPNPCEnd = false;
public boolean _isEventMobDM = false;
public boolean _isEventMobCTF = false;
public boolean _isCTF_throneSpawn = false;
public boolean _isCTF_Flag = false;
/** The _is in town. */
private boolean _isInTown = false;
/** The _ ct f_ flag team name. */
/** The ctf flag team name. */
public String _CTF_FlagTeamName;
/** The _is spoiled by. */
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+107 -14
View File
@@ -269,10 +269,26 @@ public final class L2PcInstance extends L2Playable
private static final String DELETE_SKILL_SAVE = "DELETE FROM character_skills_save WHERE char_obj_id=? AND class_index=?";
/** The _is the vip. */
public boolean _isVIP = false, _inEventVIP = false, _isNotVIP = false, _isTheVIP = false;
public boolean _isVIP = false;
/**
* The _is the vip.
*/
public boolean _inEventVIP = false;
/**
* The _is the vip.
*/
public boolean _isNotVIP = false;
/**
* The _is the vip.
*/
public boolean _isTheVIP = false;
/** The _original karma vip. */
public int _originalNameColourVIP, _originalKarmaVIP;
public int _originalNameColourVIP;
/**
* The _original karma vip.
*/
public int _originalKarmaVIP;
/** The _vote timestamp. */
private long _voteTimestamp = 0;
@@ -462,22 +478,58 @@ public final class L2PcInstance extends L2Playable
public boolean atEvent = false;
/** TvT Engine parameters. */
public String _teamNameTvT, _originalTitleTvT;
public String _teamNameTvT;
/**
* TvT Engine parameters.
*/
public String _originalTitleTvT;
/** The _original karma tv t. */
public int _originalNameColorTvT = 0, _countTvTkills, _countTvTdies, _originalKarmaTvT;
public int _originalNameColorTvT = 0;
/**
* The _original karma tv t.
*/
public int _countTvTkills;
/**
* The _original karma tv t.
*/
public int _countTvTdies;
/**
* The _original karma tv t.
*/
public int _originalKarmaTvT;
/** The _in event tv t. */
public boolean _inEventTvT = false;
/** CTF Engine parameters. */
public String _teamNameCTF, _teamNameHaveFlagCTF, _originalTitleCTF;
public String _teamNameCTF;
/**
* CTF Engine parameters.
*/
public String _teamNameHaveFlagCTF;
/**
* CTF Engine parameters.
*/
public String _originalTitleCTF;
/** The _count ct fflags. */
public int _originalNameColorCTF = 0, _originalKarmaCTF, _countCTFflags;
public int _originalNameColorCTF = 0;
/**
* The _count ct fflags.
*/
public int _originalKarmaCTF;
/**
* The _count ct fflags.
*/
public int _countCTFflags;
/** The _have flag ctf. */
public boolean _inEventCTF = false, _haveFlagCTF = false;
public boolean _inEventCTF = false;
/**
* The _have flag ctf.
*/
public boolean _haveFlagCTF = false;
/** The _pos checker ctf. */
public Future<?> _posCheckerCTF = null;
@@ -486,13 +538,33 @@ public final class L2PcInstance extends L2Playable
public String _originalTitleDM;
/** The _original karma dm. */
public int _originalNameColorDM = 0, _countDMkills, _originalKarmaDM;
public int _originalNameColorDM = 0;
/**
* The _original karma dm.
*/
public int _countDMkills;
/**
* The _original karma dm.
*/
public int _originalKarmaDM;
/** The _in event dm. */
public boolean _inEventDM = false;
/** Event Engine parameters. */
public int _originalNameColor, _countKills, _originalKarma, _eventKills;
public int _originalNameColor;
/**
* Event Engine parameters.
*/
public int _countKills;
/**
* Event Engine parameters.
*/
public int _originalKarma;
/**
* Event Engine parameters.
*/
public int _eventKills;
/** The _in event. */
public boolean _inEvent = false;
@@ -7321,7 +7393,9 @@ public final class L2PcInstance extends L2Playable
{
if (Config.TW_RESS_ON_DIE)
{
int x1, y1, z1;
int x1;
int y1;
int z1;
x1 = getX();
y1 = getY();
z1 = getZ();
@@ -8045,7 +8119,9 @@ public final class L2PcInstance extends L2Playable
*/
public void increasePvpKills()
{
int x, y, z;
int x;
int y;
int z;
x = getX();
y = getY();
z = getZ();
@@ -8433,7 +8509,9 @@ public final class L2PcInstance extends L2Playable
}
// Add karma to attacker and increase its PK counter
int x, y, z;
int x;
int y;
int z;
x = getX();
y = getY();
z = getZ();
@@ -13160,10 +13238,25 @@ public final class L2PcInstance extends L2Playable
class LookingForFishTask implements Runnable
{
/** The _is upper grade. */
boolean _isNoob, _isUpperGrade;
boolean _isNoob;
/**
* The _is upper grade.
*/
boolean _isUpperGrade;
/** The _guts check time. */
int _fishType, _fishGutsCheck, _gutsCheckTime;
int _fishType;
/**
* The _guts check time.
*/
int _fishGutsCheck;
/**
* The _guts check time.
*/
int _gutsCheckTime;
/** The _end task time. */
long _endTaskTime;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java
+7 -3
View File
@@ -308,7 +308,8 @@ public class L2RaceManagerInstance extends L2NpcInstance
return;
}
final int npcId = getTemplate().npcId;
String filename, search;
String filename;
String search;
NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
filename = getHtmlPath(npcId, 5);
html.setFile(filename);
@@ -327,7 +328,8 @@ public class L2RaceManagerInstance extends L2NpcInstance
public void showMonsterInfo(L2PcInstance player)
{
final int npcId = getTemplate().npcId;
String filename, search;
String filename;
String search;
NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
filename = getHtmlPath(npcId, 6);
html.setFile(filename);
@@ -350,7 +352,9 @@ public class L2RaceManagerInstance extends L2NpcInstance
}
final int npcId = getTemplate().npcId;
SystemMessage sm;
String filename, search, replace;
String filename;
String search;
String replace;
NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
if (val < 10)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java
+4 -2
View File
@@ -66,8 +66,10 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance
/** The _remaining time. */
private int _remainingTime = MAX_DURATION;
/** The _home z. */
private int _homeX, _homeY, _homeZ;
/** The _home. */
private int _homeX;
private int _homeY;
private int _homeZ;
/** The _owner. */
private L2PcInstance _owner;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2TownPetInstance.java
+4 -1
View File
@@ -31,7 +31,10 @@ import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate;
public class L2TownPetInstance extends L2NpcInstance
{
int randomX, randomY, spawnX, spawnY;
int randomX;
int randomY;
int spawnX;
int spawnY;
public L2TownPetInstance(int objectId, L2NpcTemplate template)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Duel.java
+11 -1
View File
@@ -190,7 +190,17 @@ public class Duel
private boolean _paDuel;
/** The _z. */
private int _x, _y, _z;
private int _x;
/**
* The _z.
*/
private int _y;
/**
* The _z.
*/
private int _z;
/** The _debuffs. */
private List<L2Effect> _debuffs;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/MonsterRace.java
+2 -1
View File
@@ -30,7 +30,8 @@ public class MonsterRace
private static MonsterRace _instance;
private Constructor<?> _constructor;
private int[][] _speeds;
private final int[] _first, _second;
private final int[] _first;
private final int[] _second;
private MonsterRace()
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/CTF.java
+185 -13
View File
@@ -67,16 +67,111 @@ public class CTF implements EventTask
protected static final Logger LOGGER = Logger.getLogger(CTF.class.getName());
/** The _joining location name. */
protected static String _eventName = new String(), _eventDesc = new String(), _joiningLocationName = new String();
protected static String _eventName = new String();
/**
* The _joining location name.
*/
protected static String _eventDesc = new String();
/**
* The _joining location name.
*/
protected static String _joiningLocationName = new String();
/** The _npc spawn. */
private static L2Spawn _npcSpawn;
/** The _in progress. */
protected static boolean _joining = false, _teleport = false, _started = false, _aborted = false, _sitForced = false, _inProgress = false;
protected static boolean _joining = false;
/**
* The _in progress.
*/
protected static boolean _teleport = false;
/**
* The _in progress.
*/
protected static boolean _started = false;
/**
* The _in progress.
*/
protected static boolean _aborted = false;
/**
* The _in progress.
*/
protected static boolean _sitForced = false;
/**
* The _in progress.
*/
protected static boolean _inProgress = false;
/** The _max players. */
protected static int _npcId = 0, _npcX = 0, _npcY = 0, _npcZ = 0, _npcHeading = 0, _rewardId = 0, _rewardAmount = 0, _minlvl = 0, _maxlvl = 0, _joinTime = 0, _eventTime = 0, _minPlayers = 0, _maxPlayers = 0;
protected static int _npcId = 0;
/**
* The _max players.
*/
protected static int _npcX = 0;
/**
* The _max players.
*/
protected static int _npcY = 0;
/**
* The _max players.
*/
protected static int _npcZ = 0;
/**
* The _max players.
*/
protected static int _npcHeading = 0;
/**
* The _max players.
*/
protected static int _rewardId = 0;
/**
* The _max players.
*/
protected static int _rewardAmount = 0;
/**
* The _max players.
*/
protected static int _minlvl = 0;
/**
* The _max players.
*/
protected static int _maxlvl = 0;
/**
* The _max players.
*/
protected static int _joinTime = 0;
/**
* The _max players.
*/
protected static int _eventTime = 0;
/**
* The _max players.
*/
protected static int _minPlayers = 0;
/**
* The _max players.
*/
protected static int _maxPlayers = 0;
/** The _interval between matches. */
protected static long _intervalBetweenMatches = 0;
@@ -97,10 +192,40 @@ public class CTF implements EventTask
public static Vector<L2PcInstance> _playersShuffle = new Vector<>();
/** The _save player teams. */
public static Vector<String> _teams = new Vector<>(), _savePlayers = new Vector<>(), _savePlayerTeams = new Vector<>();
public static Vector<String> _teams = new Vector<>();
/**
* The _save player teams.
*/
public static Vector<String> _savePlayers = new Vector<>();
/**
* The _save player teams.
*/
public static Vector<String> _savePlayerTeams = new Vector<>();
/** The _teams z. */
public static Vector<Integer> _teamPlayersCount = new Vector<>(), _teamColors = new Vector<>(), _teamsX = new Vector<>(), _teamsY = new Vector<>(), _teamsZ = new Vector<>();
public static Vector<Integer> _teamPlayersCount = new Vector<>();
/**
* The _teams z.
*/
public static Vector<Integer> _teamColors = new Vector<>();
/**
* The _teams z.
*/
public static Vector<Integer> _teamsX = new Vector<>();
/**
* The _teams z.
*/
public static Vector<Integer> _teamsY = new Vector<>();
/**
* The _teams z.
*/
public static Vector<Integer> _teamsZ = new Vector<>();
/** The _team points count. */
public static Vector<Integer> _teamPointsCount = new Vector<>();
@@ -109,16 +234,56 @@ public class CTF implements EventTask
public static int _topScore = 0;
/** The _event offset. */
public static int _eventCenterX = 0, _eventCenterY = 0, _eventCenterZ = 0, _eventOffset = 0;
public static int _eventCenterX = 0;
/**
* The _event offset.
*/
public static int _eventCenterY = 0;
/**
* The _event offset.
*/
public static int _eventCenterZ = 0;
/**
* The _event offset.
*/
public static int _eventOffset = 0;
/** The _ fla g_ i n_ han d_ ite m_ id. */
private static int _FlagNPC = 35062, _FLAG_IN_HAND_ITEM_ID = 6718;
private static int _FlagNPC = 35062;
/**
* The _ fla g_ i n_ han d_ ite m_ id.
*/
private static int _FLAG_IN_HAND_ITEM_ID = 6718;
/** The _flags z. */
public static Vector<Integer> _flagIds = new Vector<>(), _flagsX = new Vector<>(), _flagsY = new Vector<>(), _flagsZ = new Vector<>();
public static Vector<Integer> _flagIds = new Vector<>();
/**
* The _flags z.
*/
public static Vector<Integer> _flagsX = new Vector<>();
/**
* The _flags z.
*/
public static Vector<Integer> _flagsY = new Vector<>();
/**
* The _flags z.
*/
public static Vector<Integer> _flagsZ = new Vector<>();
/** The _throne spawns. */
public static Vector<L2Spawn> _flagSpawns = new Vector<>(), _throneSpawns = new Vector<>();
public static Vector<L2Spawn> _flagSpawns = new Vector<>();
/**
* The _throne spawns.
*/
public static Vector<L2Spawn> _throneSpawns = new Vector<>();
/** The _flags taken. */
public static Vector<Boolean> _flagsTaken = new Vector<>();
@@ -2353,7 +2518,8 @@ public class CTF implements EventTask
*/
public static void shuffleTeams()
{
int teamCount = 0, playersCount = 0;
int teamCount = 0;
int playersCount = 0;
synchronized (_players)
{
@@ -3397,7 +3563,9 @@ public class CTF implements EventTask
}
final int division = _teams.size() * 2;
int pos = 0;
final int[] locX = new int[division], locY = new int[division], locZ = new int[division];
final int[] locX = new int[division];
final int[] locY = new int[division];
final int[] locZ = new int[division];
// Get all coordinates inorder to create a polygon:
for (L2Spawn flag : _flagSpawns)
{
@@ -3428,7 +3596,9 @@ public class CTF implements EventTask
}
// Find the polygon center, note that it's not the mathematical center of the polygon,
// Rather than a point which centers all coordinates:
int centerX = 0, centerY = 0, centerZ = 0;
int centerX = 0;
int centerY = 0;
int centerZ = 0;
for (int x = 0; x < pos; x++)
{
centerX += (locX[x] / division);
@@ -3437,7 +3607,9 @@ public class CTF implements EventTask
}
// Now let's find the furthest distance from the "center" to the egg shaped sphere
// Surrounding the polygon, size x1.5 (for maximum logical area to wander...):
int maxX = 0, maxY = 0, maxZ = 0;
int maxX = 0;
int maxY = 0;
int maxZ = 0;
for (int x = 0; x < pos; x++)
{
if (maxX < (2 * Math.abs(centerX - locX[x])))
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/DM.java
+123 -3
View File
@@ -61,16 +61,136 @@ public class DM implements EventTask
protected static final Logger LOGGER = Logger.getLogger(DM.class.getName());
/** The _joining location name. */
private static String _eventName = new String(), _eventDesc = new String(), _joiningLocationName = new String();
private static String _eventName = new String();
/**
* The _joining location name.
*/
private static String _eventDesc = new String();
/**
* The _joining location name.
*/
private static String _joiningLocationName = new String();
/** The _npc spawn. */
private static L2Spawn _npcSpawn;
/** The _in progress. */
private static boolean _joining = false, _teleport = false, _started = false, _aborted = false, _sitForced = false, _inProgress = false;
private static boolean _joining = false;
/**
* The _in progress.
*/
private static boolean _teleport = false;
/**
* The _in progress.
*/
private static boolean _started = false;
/**
* The _in progress.
*/
private static boolean _aborted = false;
/**
* The _in progress.
*/
private static boolean _sitForced = false;
/**
* The _in progress.
*/
private static boolean _inProgress = false;
/** The _player z. */
protected static int _npcId = 0, _npcX = 0, _npcY = 0, _npcZ = 0, _npcHeading = 0, _rewardId = 0, _rewardAmount = 0, _minlvl = 0, _maxlvl = 0, _joinTime = 0, _eventTime = 0, _minPlayers = 0, _maxPlayers = 0, _topKills = 0, _playerColors = 0, _playerX = 0, _playerY = 0, _playerZ = 0;
protected static int _npcId = 0;
/**
* The _player z.
*/
protected static int _npcX = 0;
/**
* The _player z.
*/
protected static int _npcY = 0;
/**
* The _player z.
*/
protected static int _npcZ = 0;
/**
* The _player z.
*/
protected static int _npcHeading = 0;
/**
* The _player z.
*/
protected static int _rewardId = 0;
/**
* The _player z.
*/
protected static int _rewardAmount = 0;
/**
* The _player z.
*/
protected static int _minlvl = 0;
/**
* The _player z.
*/
protected static int _maxlvl = 0;
/**
* The _player z.
*/
protected static int _joinTime = 0;
/**
* The _player z.
*/
protected static int _eventTime = 0;
/**
* The _player z.
*/
protected static int _minPlayers = 0;
/**
* The _player z.
*/
protected static int _maxPlayers = 0;
/**
* The _player z.
*/
protected static int _topKills = 0;
/**
* The _player z.
*/
protected static int _playerColors = 0;
/**
* The _player z.
*/
protected static int _playerX = 0;
/**
* The _player z.
*/
protected static int _playerY = 0;
/**
* The _player z.
*/
protected static int _playerZ = 0;
/** The _interval between matchs. */
private static long _intervalBetweenMatchs = 0;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/TvT.java
+33 -34
View File
@@ -59,50 +59,48 @@ public class TvT implements EventTask
/** The Constant LOGGER. */
protected static final Logger LOGGER = Logger.getLogger(TvT.class.getName());
/** The _joining location name. */
protected static String _eventName = new String(), _eventDesc = new String(), _joiningLocationName = new String();
/** The _npc spawn. */
protected static String _eventName = new String();
protected static String _eventDesc = new String();
protected static String _joiningLocationName = new String();
private static L2Spawn _npcSpawn;
/** The _in progress. */
protected static boolean _joining = false, _teleport = false, _started = false, _aborted = false, _sitForced = false, _inProgress = false;
/** The _max players. */
protected static int _npcId = 0, _npcX = 0, _npcY = 0, _npcZ = 0, _npcHeading = 0, _rewardId = 0, _rewardAmount = 0, _minlvl = 0, _maxlvl = 0, _joinTime = 0, _eventTime = 0, _minPlayers = 0, _maxPlayers = 0;
/** The _interval between matchs. */
protected static boolean _joining = false;
protected static boolean _teleport = false;
protected static boolean _started = false;
protected static boolean _aborted = false;
protected static boolean _sitForced = false;
protected static boolean _inProgress = false;
protected static int _npcId = 0;
protected static int _npcX = 0;
protected static int _npcY = 0;
protected static int _npcZ = 0;
protected static int _npcHeading = 0;
protected static int _rewardId = 0;
protected static int _rewardAmount = 0;
protected static int _minlvl = 0;
protected static int _maxlvl = 0;
protected static int _joinTime = 0;
protected static int _eventTime = 0;
protected static int _minPlayers = 0;
protected static int _maxPlayers = 0;
protected static long _intervalBetweenMatchs = 0;
/** The start event time. */
private String startEventTime;
/** The _team event. */
private static boolean _teamEvent = true; // TODO to be integrated
/** The _players. */
public static Vector<L2PcInstance> _players = new Vector<>();
/** The _top team. */
private static String _topTeam = new String();
/** The _players shuffle. */
public static Vector<L2PcInstance> _playersShuffle = new Vector<>();
/** The _save player teams. */
public static Vector<String> _teams = new Vector<>(), _savePlayers = new Vector<>(), _savePlayerTeams = new Vector<>();
/** The _teams z. */
public static Vector<Integer> _teamPlayersCount = new Vector<>(), _teamColors = new Vector<>(), _teamsX = new Vector<>(), _teamsY = new Vector<>(), _teamsZ = new Vector<>();
/** The _team points count. */
public static Vector<String> _teams = new Vector<>();
public static Vector<String> _savePlayers = new Vector<>();
public static Vector<String> _savePlayerTeams = new Vector<>();
public static Vector<Integer> _teamPlayersCount = new Vector<>();
public static Vector<Integer> _teamColors = new Vector<>();
public static Vector<Integer> _teamsX = new Vector<>();
public static Vector<Integer> _teamsY = new Vector<>();
public static Vector<Integer> _teamsZ = new Vector<>();
public static Vector<Integer> _teamPointsCount = new Vector<>();
/** The _top kills. */
public static int _topKills = 0;
/**
* Instantiates a new tv t.
* Instantiates a new tvt.
*/
private TvT()
{
@@ -2230,7 +2228,8 @@ public class TvT implements EventTask
*/
public static void shuffleTeams()
{
int teamCount = 0, playersCount = 0;
int teamCount = 0;
int playersCount = 0;
synchronized (_players)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/VIP.java
+31 -14
View File
@@ -45,20 +45,37 @@ import com.l2jmobius.gameserver.templates.item.L2Item;
public class VIP
{
private static final Logger LOGGER = Logger.getLogger(VIP.class.getName());
public static String _teamName = "", _joinArea = "";
public static int _time = 0, _winners = 0, _vipReward = 0, _vipRewardAmount = 0, _notVipReward = 0, _notVipRewardAmount = 0, _theVipReward = 0, _theVipRewardAmount = 0, _endNPC = 0, _joinNPC = 0, _delay = 0, _endX = 0, _endY = 0, _endZ = 0, _startX = 0, _startY = 0, _startZ = 0, _joinX = 0,
_joinY = 0, _joinZ = 0, _team = 0; // Human = 1
// Elf = 2
// Dark = 3
// Orc = 4
// Dwarf = 5
public static boolean _started = false, _joining = false, _inProgress = true, _sitForced = false;
public static L2Spawn _endSpawn, _joinSpawn;
public static Vector<L2PcInstance> _playersVIP = new Vector<>(), _playersNotVIP = new Vector<>();
public static String _teamName = "";
public static String _joinArea = "";
public static int _time = 0;
public static int _winners = 0;
public static int _vipReward = 0;
public static int _vipRewardAmount = 0;
public static int _notVipReward = 0;
public static int _notVipRewardAmount = 0;
public static int _theVipReward = 0;
public static int _theVipRewardAmount = 0;
public static int _endNPC = 0;
public static int _joinNPC = 0;
public static int _delay = 0;
public static int _endX = 0;
public static int _endY = 0;
public static int _endZ = 0;
public static int _startX = 0;
public static int _startY = 0;
public static int _startZ = 0;
public static int _joinX = 0;
public static int _joinY = 0;
public static int _joinZ = 0;
public static int _team = 0;
public static boolean _started = false;
public static boolean _joining = false;
public static boolean _inProgress = true;
public static boolean _sitForced = false;
public static L2Spawn _endSpawn;
public static L2Spawn _joinSpawn;
public static Vector<L2PcInstance> _playersVIP = new Vector<>();
public static Vector<L2PcInstance> _playersNotVIP = new Vector<>();
public static void setTeam(String team, L2PcInstance activeChar)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java
+6 -1
View File
@@ -79,7 +79,12 @@ class OlympiadGame
public L2PcInstance _playerTwo;
protected List<L2PcInstance> _players;
private int[] _stadiumPort;
private int x1, y1, z1, x2, y2, z2;
private int x1;
private int y1;
private int z1;
private int x2;
private int y2;
private int z2;
public int _stadiumID;
private SystemMessage _sm;
private SystemMessage _sm2;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Siege.java
+4 -1
View File
@@ -1727,7 +1727,10 @@ public class Siege
{
L2ControlTowerInstance closestCt;
double distance, x, y, z;
double distance;
double x;
double y;
double z;
double distanceClosest = 0;
for (L2Spawn spawn : getSiegeGuardManager().getSiegeGuardSpawn())
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/multisell/L2Multisell.java
+2 -1
View File
@@ -406,7 +406,8 @@ public class L2Multisell
final int id = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
final int count = Integer.parseInt(n.getAttributes().getNamedItem("count").getNodeValue());
boolean isTaxIngredient = false, mantainIngredient = false;
boolean isTaxIngredient = false;
boolean mantainIngredient = false;
attribute = n.getAttributes().getNamedItem("isTaxIngredient");
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/multisell/MultiSellIngredient.java
+5 -2
View File
@@ -21,8 +21,11 @@ package com.l2jmobius.gameserver.model.multisell;
*/
public class MultiSellIngredient
{
private int _itemId, _itemCount, _enchantmentLevel;
private boolean _isTaxIngredient, _mantainIngredient;
private int _itemId;
private int _itemCount;
private int _enchantmentLevel;
private boolean _isTaxIngredient;
private boolean _mantainIngredient;
public MultiSellIngredient(int itemId, int itemCount, boolean isTaxIngredient, boolean mantainIngredient)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2GroupSpawn.java
+3 -1
View File
@@ -67,7 +67,9 @@ public class L2GroupSpawn extends L2Spawn
mob = (L2NpcInstance) tmp;
int newlocx, newlocy, newlocz;
int newlocx;
int newlocy;
int newlocz;
if ((getX() == 0) && (getY() == 0))
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2Spawn.java
+3 -1
View File
@@ -541,7 +541,9 @@ public class L2Spawn
*/
private L2NpcInstance initializeNpcInstance(L2NpcInstance mob)
{
int newlocx, newlocy, newlocz;
int newlocx;
int newlocy;
int newlocz;
// If Locx=0 and Locy=0, the L2NpcInstance must be spawned in an area defined by location
if ((_locX == 0) && (_locY == 0))
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/waypoint/WayPointNode.java
+11 -5
View File
@@ -34,12 +34,14 @@ import com.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
* This class ...
* @version $Revision: 1.2 $ $Date: 2004/06/27 08:12:59 $
*/
public class WayPointNode extends L2Object
{
private int _id;
private String _title, _type;
private static final String NORMAL = "Node", SELECTED = "Selected", LINKED = "Linked";
private String _title;
private String _type;
private static final String NORMAL = "Node";
private static final String SELECTED = "Selected";
private static final String LINKED = "Linked";
private static int _lineId = 5560;
private static final String LINE_TYPE = "item";
private final Map<WayPointNode, List<WayPointNode>> _linkLists;
@@ -181,8 +183,12 @@ public class WayPointNode extends L2Object
*/
public static void drawLine(WayPointNode nodeA, WayPointNode nodeB)
{
int x1 = nodeA.getX(), y1 = nodeA.getY(), z1 = nodeA.getZ();
final int x2 = nodeB.getX(), y2 = nodeB.getY(), z2 = nodeB.getZ();
int x1 = nodeA.getX();
int y1 = nodeA.getY();
int z1 = nodeA.getZ();
final int x2 = nodeB.getX();
final int y2 = nodeB.getY();
final int z2 = nodeB.getZ();
final int modX = (x1 - x2) > 0 ? -1 : 1;
final int modY = (y1 - y2) > 0 ? -1 : 1;
final int modZ = (z1 - z2) > 0 ? -1 : 1;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java
+8 -2
View File
@@ -24,7 +24,12 @@ import com.l2jmobius.gameserver.model.zone.L2ZoneForm;
*/
public class ZoneCuboid extends L2ZoneForm
{
private int _x1, _x2, _y1, _y2, _z1, _z2;
private int _x1;
private int _x2;
private int _y1;
private int _y2;
private int _z1;
private int _z2;
public ZoneCuboid(int x1, int x2, int y1, int y2, int z1, int z2)
{
@@ -166,7 +171,8 @@ public class ZoneCuboid extends L2ZoneForm
return 0; // If you are inside the zone distance to zone is 0.
}
double test, shortestDist = Math.pow(_x1 - x, 2) + Math.pow(_y1 - y, 2);
double test;
double shortestDist = Math.pow(_x1 - x, 2) + Math.pow(_y1 - y, 2);
test = Math.pow(_x1 - x, 2) + Math.pow(_y2 - y, 2);
if (test < shortestDist)
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java
+6 -1
View File
@@ -24,7 +24,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)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java
+6 -2
View File
@@ -59,7 +59,10 @@ public class ZoneNPoly extends L2ZoneForm
@Override
public boolean intersectsRectangle(int ax1, int ax2, int ay1, int ay2)
{
int tX, tY, uX, uY;
int tX;
int tY;
int uX;
int uY;
// First check if a point of the polygon lies inside the rectangle
if ((_x[0] > ax1) && (_x[0] < ax2) && (_y[0] > ay1) && (_y[0] < ay2))
@@ -109,7 +112,8 @@ public class ZoneNPoly extends L2ZoneForm
@Override
public double getDistanceToZone(int x, int y)
{
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 < _y.length; i++)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
+3 -1
View File
@@ -30,7 +30,9 @@ import com.l2jmobius.gameserver.network.serverpackets.TradeUpdate;
public final class AddTradeItem extends L2GameClientPacket
{
private static Logger LOGGER = Logger.getLogger(AddTradeItem.class.getName());
private int _tradeId, _objectId, _count;
private int _tradeId;
private int _objectId;
private int _count;
public AddTradeItem()
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymore.java
+4 -1
View File
@@ -26,7 +26,10 @@ import com.l2jmobius.gameserver.model.actor.position.Location;
public final class CannotMoveAnymore extends L2GameClientPacket
{
private static Logger LOGGER = Logger.getLogger(CannotMoveAnymore.class.getName());
private int _x, _y, _z, _heading;
private int _x;
private int _y;
private int _z;
private int _heading;
@Override
protected void readImpl()
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+12 -2
View File
@@ -53,8 +53,18 @@ public final class CharacterCreate extends L2GameClientPacket
private static final Object CREATION_LOCK = new Object();
private String _name;
private byte _sex, _hairStyle, _hairColor, _face;
private int _race, _classId, _int, _str, _con, _men, _dex, _wit;
private byte _sex;
private byte _hairStyle;
private byte _hairColor;
private byte _face;
private int _race;
private int _classId;
private int _int;
private int _str;
private int _con;
private int _men;
private int _dex;
private int _wit;
@Override
protected void readImpl()
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelected.java
+4 -1
View File
@@ -30,7 +30,10 @@ public class CharacterSelected extends L2GameClientPacket
{
private static Logger LOGGER = Logger.getLogger(CharacterSelected.class.getName());
private int _charSlot;
private int _unk1, _unk2, _unk3, _unk4; // new in C4
private int _unk1; // new in C4
private int _unk2;
private int _unk3;
private int _unk4;
@Override
protected void readImpl()
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+3 -1
View File
@@ -28,7 +28,9 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
public final class DlgAnswer extends L2GameClientPacket
{
private static Logger LOGGER = Logger.getLogger(DlgAnswer.class.getName());
private int _messageId, _answer, _requestId;
private int _messageId;
private int _answer;
private int _requestId;
@Override
protected void readImpl()
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/FinishRotating.java
+2 -1
View File
@@ -23,7 +23,8 @@ import com.l2jmobius.gameserver.network.serverpackets.StopRotation;
@SuppressWarnings("unused")
public final class FinishRotating extends L2GameClientPacket
{
private int _degree, _unknown;
private int _degree;
private int _unknown;
@Override
protected void readImpl()
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/MoveWithDelta.java
+3 -1
View File
@@ -23,7 +23,9 @@ package com.l2jmobius.gameserver.network.clientpackets;
@SuppressWarnings("unused")
public class MoveWithDelta extends L2GameClientPacket
{
private int _dx, _dy, _dz;
private int _dx;
private int _dy;
private int _dz;
@Override
protected void readImpl()
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java
+2 -1
View File
@@ -57,7 +57,8 @@ public final class RequestDuelAnswerStart extends L2GameClientPacket
if (_response == 1)
{
SystemMessage msg1 = null, msg2 = null;
SystemMessage msg1 = null;
SystemMessage msg2 = null;
if (requestor.isInDuel())
{
msg1 = new SystemMessage(SystemMessageId.S1_CANNOT_DUEL_BECAUSE_S1_IS_ALREADY_ENGAGED_IN_A_DUEL);
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOffVehicle.java
+4 -1
View File
@@ -26,7 +26,10 @@ import com.l2jmobius.gameserver.network.serverpackets.GetOffVehicle;
*/
public final class RequestGetOffVehicle extends L2GameClientPacket
{
private int _id, _x, _y, _z;
private int _id;
private int _x;
private int _y;
private int _z;
@Override
protected void readImpl()
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestGetOnVehicle.java
+4 -1
View File
@@ -24,7 +24,10 @@ import com.l2jmobius.gameserver.network.serverpackets.GetOnVehicle;
public final class RequestGetOnVehicle extends L2GameClientPacket
{
private int _id, _x, _y, _z;
private int _id;
private int _x;
private int _y;
private int _z;
@Override
protected void readImpl()
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
+3 -1
View File
@@ -40,7 +40,9 @@ public final class RequestMoveToLocationInVehicle extends L2GameClientPacket
@Override
protected void readImpl()
{
int _x, _y, _z;
int _x;
int _y;
int _z;
_boatId = readD(); // objectId of boat
_x = readD();
_y = readD();
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java
+3 -1
View File
@@ -28,7 +28,9 @@ import com.l2jmobius.gameserver.network.serverpackets.PartyMatchList;
public final class RequestPartyMatchConfig extends L2GameClientPacket
{
private int _auto, _loc, _lvl;
private int _auto;
private int _loc;
private int _lvl;
@Override
protected void readImpl()
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
+2 -1
View File
@@ -65,7 +65,8 @@ public final class RequestPledgeSetAcademyMaster extends L2GameClientPacket
return;
}
L2ClanMember apprenticeMember, sponsorMember;
L2ClanMember apprenticeMember;
L2ClanMember sponsorMember;
if (currentMember.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java
+3 -1
View File
@@ -63,7 +63,9 @@ public final class ValidatePosition extends L2GameClientPacket
}
}
int dx, dy, dz;
int dx;
int dy;
int dz;
double diffSq;
if (activeChar.isInBoat())
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/AquireSkillInfo.java
+4 -1
View File
@@ -33,7 +33,10 @@ import java.util.List;
public class AquireSkillInfo extends L2GameServerPacket
{
private final List<Req> _reqs;
private final int _id, _level, _spCost, _mode;
private final int _id;
private final int _level;
private final int _spCost;
private final int _mode;
private class Req
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java
+3 -1
View File
@@ -26,7 +26,9 @@ public class ChangeWaitType extends L2GameServerPacket
{
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_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java
+12 -8
View File
@@ -70,18 +70,22 @@ public class CharInfo extends L2GameServerPacket
private final L2PcInstance _activeChar;
private final Inventory _inv;
private final int _x, _y, _z, _heading;
private final int _mAtkSpd, _pAtkSpd;
private final int _runSpd, _walkSpd, _swimRunSpd, _swimWalkSpd;
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 int _flRunSpd;
private int _flWalkSpd;
private int _flyRunSpd;
private int _flyWalkSpd;
private final float _moveMultiplier, _attackSpeedMultiplier;
private final float _moveMultiplier;
private final float _attackSpeedMultiplier;
private final int _maxCp;
/**
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/CharMoveToLocation.java
+7 -1
View File
@@ -25,7 +25,13 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
*/
public class CharMoveToLocation extends L2GameServerPacket
{
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 CharMoveToLocation(L2Character cha)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java
+7 -1
View File
@@ -25,7 +25,13 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
public class ExFishingHpRegen extends L2GameServerPacket
{
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_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java
+4 -1
View File
@@ -25,7 +25,10 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
public class ExFishingStart extends L2GameServerPacket
{
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;
@SuppressWarnings("unused")
private final boolean _isNightLure;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java
+5 -2
View File
@@ -25,8 +25,11 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
public class ExFishingStartCombat extends L2GameServerPacket
{
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_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java
+13 -1
View File
@@ -23,7 +23,19 @@ package com.l2jmobius.gameserver.network.serverpackets;
public class ExUseSharedGroupItem extends L2GameServerPacket
{
/** The _unk4. */
private final int _unk1, _unk2, _unk3, _unk4;
private final int _unk1;
/**
* The _unk4.
*/
private final int _unk2;
/**
* The _unk4.
*/
private final int _unk3;
/**
* The _unk4.
*/
private final int _unk4;
/**
* Instantiates a new ex use shared group item.
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/FriendRecvMsg.java
+3 -1
View File
@@ -22,7 +22,9 @@ package com.l2jmobius.gameserver.network.serverpackets;
*/
public class FriendRecvMsg extends L2GameServerPacket
{
private final String _sender, _receiver, _message;
private final String _sender;
private final String _receiver;
private final String _message;
public FriendRecvMsg(String sender, String reciever, String message)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java
+4 -1
View File
@@ -29,7 +29,10 @@ public class MagicSkillUse extends L2GameServerPacket
private final int _skillLevel;
private final int _hitTime;
private final int _reuseDelay;
private final int _charObjId, _x, _y, _z;
private final int _charObjId;
private final int _x;
private final int _y;
private final int _z;
public MagicSkillUse(L2Character cha, L2Character target, int skillId, int skillLevel, int hitTime, int reuseDelay)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/MoveOnVehicle.java
+3 -1
View File
@@ -31,7 +31,9 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
public class MoveOnVehicle extends L2GameServerPacket
{
private final int _id;
private final int _x, _y, _z;
private final int _x;
private final int _y;
private final int _z;
private final L2PcInstance _activeChar;
public MoveOnVehicle(int vehicleID, L2PcInstance player, int x, int y, int z)
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java
+3 -1
View File
@@ -33,7 +33,9 @@ public class MoveToPawn extends L2GameServerPacket
private final int _charObjId;
private final int _targetId;
private final int _distance;
private final int _x, _y, _z;
private final int _x;
private final int _y;
private final int _z;
public MoveToPawn(L2Character cha, L2Character target, int distance)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/MultiSellList.java
+3 -1
View File
@@ -27,7 +27,9 @@ import com.l2jmobius.gameserver.model.multisell.MultiSellListContainer;
*/
public class MultiSellList extends L2GameServerPacket
{
protected int _listId, _page, _finished;
protected int _listId;
protected int _page;
protected int _finished;
protected MultiSellListContainer _list;
public MultiSellList(MultiSellListContainer list, int page, int finished)
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfo.java
+20 -25
View File
@@ -30,34 +30,29 @@ import com.l2jmobius.gameserver.model.actor.instance.L2SummonInstance;
*/
public class NpcInfo extends L2GameServerPacket
{
/** The _active char. */
private L2Character _activeChar;
/** The _heading. */
private int _x, _y, _z, _heading;
/** The _id template. */
private int _x;
private int _y;
private int _z;
private int _heading;
private int _idTemplate;
/** The _is summoned. */
private boolean _isAttackable, _isSummoned;
/** The _p atk spd. */
private int _mAtkSpd, _pAtkSpd;
/** The _fly walk spd. */
private int _runSpd, _walkSpd, _swimRunSpd, _swimWalkSpd, _flRunSpd, _flWalkSpd, _flyRunSpd, _flyWalkSpd;
/** The _lhand. */
private int _rhand, _lhand;
/** The _collision radius. */
private int _collisionHeight, _collisionRadius;
/** The _name. */
private boolean _isAttackable;
private boolean _isSummoned;
private int _mAtkSpd;
private int _pAtkSpd;
private int _runSpd;
private int _walkSpd;
private int _swimRunSpd;
private int _swimWalkSpd;
private int _flRunSpd;
private int _flWalkSpd;
private int _flyRunSpd;
private int _flyWalkSpd;
private int _rhand;
private int _lhand;
private int _collisionHeight;
private int _collisionRadius;
private String _name = "";
/** The _title. */
private String _title = "";
/**
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/NpcInfoPoly.java
+18 -34
View File
@@ -28,51 +28,35 @@ import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate;
*/
public class NpcInfoPoly extends L2GameServerPacket
{
/** The _active char. */
private L2Character _activeChar;
/** The _obj. */
private final L2Object _obj;
/** The _heading. */
private int _x, _y, _z, _heading;
/** The _npc id. */
private int _x;
private int _y;
private int _z;
private int _heading;
private final int _npcId;
/** The _is alike dead. */
private boolean _isAttackable;
private final boolean _isSummoned;
private boolean _isRunning;
private boolean _isInCombat;
private boolean _isAlikeDead;
/** The _p atk spd. */
private int _mAtkSpd, _pAtkSpd;
/** The _fly walk spd. */
private int _runSpd, _walkSpd, _swimRunSpd, _swimWalkSpd, _flRunSpd, _flWalkSpd, _flyRunSpd, _flyWalkSpd;
/** The _lhand. */
private int _rhand, _lhand;
/** The _title. */
private String _name, _title;
/** The _abnormal effect. */
private int _mAtkSpd;
private int _pAtkSpd;
private int _runSpd;
private int _walkSpd;
private int _swimRunSpd;
private int _swimWalkSpd;
private int _flRunSpd;
private int _flWalkSpd;
private int _flyRunSpd;
private int _flyWalkSpd;
private int _rhand;
private int _lhand;
private String _name;
private String _title;
private int _abnormalEffect;
/** The _template. */
L2NpcTemplate _template;
/** The _collision radius. */
private final int _collisionRadius;
/** The _collision height. */
private final int _collisionHeight;
/**
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ObservationMode.java
+3 -1
View File
@@ -22,7 +22,9 @@ package com.l2jmobius.gameserver.network.serverpackets;
*/
public class ObservationMode extends L2GameServerPacket
{
private final int _x, _y, _z;
private final int _x;
private final int _y;
private final int _z;
/**
* @param x
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java
+2 -1
View File
@@ -27,7 +27,8 @@ public final class PartySmallWindowAll extends L2GameServerPacket
{
private final L2Party _party;
private final L2PcInstance _exclude;
private final int _dist, _LeaderOID;
private final int _dist;
private final int _LeaderOID;
public PartySmallWindowAll(L2PcInstance exclude, L2Party party)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PetInfo.java
+14 -5
View File
@@ -27,16 +27,25 @@ import com.l2jmobius.gameserver.model.actor.instance.L2SummonInstance;
public class PetInfo extends L2GameServerPacket
{
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 _mAtkSpd, _pAtkSpd;
private final int _runSpd, _walkSpd, _swimRunSpd, _swimWalkSpd;
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 int _flRunSpd;
private int _flWalkSpd;
private int _flyRunSpd;
private int _flyWalkSpd;
private final int _maxHp, _maxMp;
private int _maxFed, _curFed;
private final int _maxHp;
private final int _maxMp;
private int _maxFed;
private int _curFed;
/**
* rev 478 dddddddddddddddddddffffdddcccccSSdddddddddddddddddddddddddddhc
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java
+4 -2
View File
@@ -27,8 +27,10 @@ import com.l2jmobius.gameserver.model.actor.instance.L2SummonInstance;
public class PetStatusUpdate extends L2GameServerPacket
{
private final L2Summon _summon;
private final int _maxHp, _maxMp;
private int _maxFed, _curFed;
private final int _maxHp;
private final int _maxMp;
private int _maxFed;
private int _curFed;
public PetStatusUpdate(L2Summon summon)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java
+2 -1
View File
@@ -26,7 +26,8 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
*/
public class RecipeShopSellList extends L2GameServerPacket
{
private final L2PcInstance _buyer, _manufacturer;
private final L2PcInstance _buyer;
private final L2PcInstance _manufacturer;
public RecipeShopSellList(L2PcInstance buyer, L2PcInstance manufacturer)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/RelationChanged.java
+3 -1
View File
@@ -35,7 +35,9 @@ public class RelationChanged extends L2GameServerPacket
public static final int RELATION_MUTUAL_WAR = 0x08000; // double fist
public static final int RELATION_1SIDED_WAR = 0x10000; // single fist
private final int _objId, _relation, _autoAttackable;
private final int _objId;
private final int _relation;
private final int _autoAttackable;
private int _karma;
private int _pvpFlag;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SetToLocation.java
+4 -1
View File
@@ -31,7 +31,10 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
public class SetToLocation extends L2GameServerPacket
{
private final int _charObjId;
private final int _x, _y, _z, _heading;
private final int _x;
private final int _y;
private final int _z;
private final int _heading;
public SetToLocation(L2Character character)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItem.java
+5 -2
View File
@@ -26,8 +26,11 @@ public class SpawnItem extends L2GameServerPacket
{
private final int _objectId;
private final int _itemId;
private final int _x, _y, _z;
private final int _stackable, _count;
private final int _x;
private final int _y;
private final int _z;
private final int _stackable;
private final int _count;
public SpawnItem(L2ItemInstance item)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/SpawnItemPoly.java
+5 -2
View File
@@ -27,8 +27,11 @@ public class SpawnItemPoly extends L2GameServerPacket
{
private int _objectId;
private int _itemId;
private int _x, _y, _z;
private int _stackable, _count;
private int _x;
private int _y;
private int _z;
private int _stackable;
private int _count;
public SpawnItemPoly(L2Object object)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java
+4 -1
View File
@@ -43,7 +43,10 @@ import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate;
public class UserInfo extends L2GameServerPacket
{
private final L2PcInstance _activeChar;
private final int _runSpd, _walkSpd, _swimRunSpd, _swimWalkSpd;
private final int _runSpd;
private final int _walkSpd;
private final int _swimRunSpd;
private final int _swimWalkSpd;
private int _flRunSpd;
private int _flWalkSpd;
private int _flyRunSpd;
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java
+4 -1
View File
@@ -21,7 +21,10 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
public class ValidateLocation extends L2GameServerPacket
{
private final int _charObjId;
private final int _x, _y, _z, _heading;
private final int _x;
private final int _y;
private final int _z;
private final int _heading;
public ValidateLocation(L2Character cha)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/script/DateRange.java
+2 -1
View File
@@ -27,7 +27,8 @@ import java.util.logging.Logger;
public class DateRange
{
private static 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_C6_Interlude/java/com/l2jmobius/gameserver/util/MinionList.java
+3 -1
View File
@@ -189,7 +189,9 @@ public class MinionList
synchronized (minionReferences)
{
int minionCount, minionId, minionsToSpawn;
int minionCount;
int minionId;
int minionsToSpawn;
for (L2MinionData minion : minions)
{
L2J_Mobius_C6_Interlude/java/com/l2jmobius/loginserver/network/serverpackets/LoginOk.java
+2 -1
View File
@@ -23,7 +23,8 @@ import com.l2jmobius.loginserver.SessionKey;
*/
public final class LoginOk extends L2LoginServerPacket
{
private final int _loginOk1, _loginOk2;
private final int _loginOk1;
private final int _loginOk2;
public LoginOk(SessionKey sessionKey)
{

Some files were not shown because too many files have changed in this diff Show More