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

No need to use variables once.

Browse Source
This commit is contained in:
MobiusDev
2017-08-27 00:39:50 +00:00
parent 34436d42d2
commit 6eed6bce3a
5 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -88,9 +88,7 @@ public class GeoEngine
{ {
for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++) for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++)
{ {
final String filename = String.format(GeoFormat.L2D.getFilename(), rx, ry); final File f = new File(Config.GEODATA_PATH + String.format(GeoFormat.L2D.getFilename(), rx, ry));
final String filepath = Config.GEODATA_PATH + filename;
final File f = new File(filepath);
if (f.exists() && !f.isDirectory()) if (f.exists() && !f.isDirectory())
{ {
// region file is load-able, try to load it // region file is load-able, try to load it
@@ -129,10 +127,9 @@ public class GeoEngine
private final boolean loadGeoBlocks(int regionX, int regionY) private final boolean loadGeoBlocks(int regionX, int regionY)
{ {
final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY); final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY);
final String filepath = Config.GEODATA_PATH + filename;
// standard load // standard load
try (RandomAccessFile raf = new RandomAccessFile(filepath, "r"); try (RandomAccessFile raf = new RandomAccessFile(Config.GEODATA_PATH + filename, "r");
FileChannel fc = raf.getChannel()) FileChannel fc = raf.getChannel())
{ {
// initialize file buffer // initialize file buffer
@@ -155,22 +152,27 @@ public class GeoEngine
switch (type) switch (type)
{ {
case GeoStructure.TYPE_FLAT_L2D: case GeoStructure.TYPE_FLAT_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D);
break; break;
}
case GeoStructure.TYPE_COMPLEX_L2D: case GeoStructure.TYPE_COMPLEX_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D);
break; break;
}
case GeoStructure.TYPE_MULTILAYER_L2D: case GeoStructure.TYPE_MULTILAYER_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D);
break; break;
}
default: default:
{
throw new IllegalArgumentException("Unknown block type: " + type); throw new IllegalArgumentException("Unknown block type: " + type);
} }
} }
} }
}
// check data consistency // check data consistency
if (buffer.remaining() > 0) if (buffer.remaining() > 0)

18
L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -88,9 +88,7 @@ public class GeoEngine
{ {
for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++) for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++)
{ {
final String filename = String.format(GeoFormat.L2D.getFilename(), rx, ry); final File f = new File(Config.GEODATA_PATH + String.format(GeoFormat.L2D.getFilename(), rx, ry));
final String filepath = Config.GEODATA_PATH + filename;
final File f = new File(filepath);
if (f.exists() && !f.isDirectory()) if (f.exists() && !f.isDirectory())
{ {
// region file is load-able, try to load it // region file is load-able, try to load it
@@ -129,10 +127,9 @@ public class GeoEngine
private final boolean loadGeoBlocks(int regionX, int regionY) private final boolean loadGeoBlocks(int regionX, int regionY)
{ {
final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY); final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY);
final String filepath = Config.GEODATA_PATH + filename;
// standard load // standard load
try (RandomAccessFile raf = new RandomAccessFile(filepath, "r"); try (RandomAccessFile raf = new RandomAccessFile(Config.GEODATA_PATH + filename, "r");
FileChannel fc = raf.getChannel()) FileChannel fc = raf.getChannel())
{ {
// initialize file buffer // initialize file buffer
@@ -155,22 +152,27 @@ public class GeoEngine
switch (type) switch (type)
{ {
case GeoStructure.TYPE_FLAT_L2D: case GeoStructure.TYPE_FLAT_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D);
break; break;
}
case GeoStructure.TYPE_COMPLEX_L2D: case GeoStructure.TYPE_COMPLEX_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D);
break; break;
}
case GeoStructure.TYPE_MULTILAYER_L2D: case GeoStructure.TYPE_MULTILAYER_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D);
break; break;
}
default: default:
{
throw new IllegalArgumentException("Unknown block type: " + type); throw new IllegalArgumentException("Unknown block type: " + type);
} }
} }
} }
}
// check data consistency // check data consistency
if (buffer.remaining() > 0) if (buffer.remaining() > 0)

18
L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -88,9 +88,7 @@ public class GeoEngine
{ {
for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++) for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++)
{ {
final String filename = String.format(GeoFormat.L2D.getFilename(), rx, ry); final File f = new File(Config.GEODATA_PATH + String.format(GeoFormat.L2D.getFilename(), rx, ry));
final String filepath = Config.GEODATA_PATH + filename;
final File f = new File(filepath);
if (f.exists() && !f.isDirectory()) if (f.exists() && !f.isDirectory())
{ {
// region file is load-able, try to load it // region file is load-able, try to load it
@@ -129,10 +127,9 @@ public class GeoEngine
private final boolean loadGeoBlocks(int regionX, int regionY) private final boolean loadGeoBlocks(int regionX, int regionY)
{ {
final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY); final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY);
final String filepath = Config.GEODATA_PATH + filename;
// standard load // standard load
try (RandomAccessFile raf = new RandomAccessFile(filepath, "r"); try (RandomAccessFile raf = new RandomAccessFile(Config.GEODATA_PATH + filename, "r");
FileChannel fc = raf.getChannel()) FileChannel fc = raf.getChannel())
{ {
// initialize file buffer // initialize file buffer
@@ -155,22 +152,27 @@ public class GeoEngine
switch (type) switch (type)
{ {
case GeoStructure.TYPE_FLAT_L2D: case GeoStructure.TYPE_FLAT_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D);
break; break;
}
case GeoStructure.TYPE_COMPLEX_L2D: case GeoStructure.TYPE_COMPLEX_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D);
break; break;
}
case GeoStructure.TYPE_MULTILAYER_L2D: case GeoStructure.TYPE_MULTILAYER_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D);
break; break;
}
default: default:
{
throw new IllegalArgumentException("Unknown block type: " + type); throw new IllegalArgumentException("Unknown block type: " + type);
} }
} }
} }
}
// check data consistency // check data consistency
if (buffer.remaining() > 0) if (buffer.remaining() > 0)

18
L2J_Mobius_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -86,9 +86,7 @@ public class GeoEngine
{ {
for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++) for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++)
{ {
final String filename = String.format(GeoFormat.L2D.getFilename(), rx, ry); final File f = new File(Config.GEODATA_PATH + String.format(GeoFormat.L2D.getFilename(), rx, ry));
final String filepath = Config.GEODATA_PATH + filename;
final File f = new File(filepath);
if (f.exists() && !f.isDirectory()) if (f.exists() && !f.isDirectory())
{ {
// region file is load-able, try to load it // region file is load-able, try to load it
@@ -127,10 +125,9 @@ public class GeoEngine
private final boolean loadGeoBlocks(int regionX, int regionY) private final boolean loadGeoBlocks(int regionX, int regionY)
{ {
final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY); final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY);
final String filepath = Config.GEODATA_PATH + filename;
// standard load // standard load
try (RandomAccessFile raf = new RandomAccessFile(filepath, "r"); try (RandomAccessFile raf = new RandomAccessFile(Config.GEODATA_PATH + filename, "r");
FileChannel fc = raf.getChannel()) FileChannel fc = raf.getChannel())
{ {
// initialize file buffer // initialize file buffer
@@ -153,22 +150,27 @@ public class GeoEngine
switch (type) switch (type)
{ {
case GeoStructure.TYPE_FLAT_L2D: case GeoStructure.TYPE_FLAT_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D);
break; break;
}
case GeoStructure.TYPE_COMPLEX_L2D: case GeoStructure.TYPE_COMPLEX_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D);
break; break;
}
case GeoStructure.TYPE_MULTILAYER_L2D: case GeoStructure.TYPE_MULTILAYER_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D);
break; break;
}
default: default:
{
throw new IllegalArgumentException("Unknown block type: " + type); throw new IllegalArgumentException("Unknown block type: " + type);
} }
} }
} }
}
// check data consistency // check data consistency
if (buffer.remaining() > 0) if (buffer.remaining() > 0)

18
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@@ -88,9 +88,7 @@ public class GeoEngine
{ {
for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++) for (int ry = L2World.TILE_Y_MIN; ry <= L2World.TILE_Y_MAX; ry++)
{ {
final String filename = String.format(GeoFormat.L2D.getFilename(), rx, ry); final File f = new File(Config.GEODATA_PATH + String.format(GeoFormat.L2D.getFilename(), rx, ry));
final String filepath = Config.GEODATA_PATH + filename;
final File f = new File(filepath);
if (f.exists() && !f.isDirectory()) if (f.exists() && !f.isDirectory())
{ {
// region file is load-able, try to load it // region file is load-able, try to load it
@@ -129,10 +127,9 @@ public class GeoEngine
private final boolean loadGeoBlocks(int regionX, int regionY) private final boolean loadGeoBlocks(int regionX, int regionY)
{ {
final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY); final String filename = String.format(GeoFormat.L2D.getFilename(), regionX, regionY);
final String filepath = Config.GEODATA_PATH + filename;
// standard load // standard load
try (RandomAccessFile raf = new RandomAccessFile(filepath, "r"); try (RandomAccessFile raf = new RandomAccessFile(Config.GEODATA_PATH + filename, "r");
FileChannel fc = raf.getChannel()) FileChannel fc = raf.getChannel())
{ {
// initialize file buffer // initialize file buffer
@@ -155,22 +152,27 @@ public class GeoEngine
switch (type) switch (type)
{ {
case GeoStructure.TYPE_FLAT_L2D: case GeoStructure.TYPE_FLAT_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockFlat(buffer, GeoFormat.L2D);
break; break;
}
case GeoStructure.TYPE_COMPLEX_L2D: case GeoStructure.TYPE_COMPLEX_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockComplex(buffer, GeoFormat.L2D);
break; break;
}
case GeoStructure.TYPE_MULTILAYER_L2D: case GeoStructure.TYPE_MULTILAYER_L2D:
{
_blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D); _blocks[blockX + ix][blockY + iy] = new BlockMultilayer(buffer, GeoFormat.L2D);
break; break;
}
default: default:
{
throw new IllegalArgumentException("Unknown block type: " + type); throw new IllegalArgumentException("Unknown block type: " + type);
} }
} }
} }
}
// check data consistency // check data consistency
if (buffer.remaining() > 0) if (buffer.remaining() > 0)