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

Probable getBlock array index out of bounds NPE fix.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-05-16 23:44:03 +00:00
parent d048eb9816
commit 77e5379d97
14 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -272,7 +272,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -272,7 +272,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
View File

@ -274,7 +274,7 @@ public class GeoEngine
final int y = geoY / GeoStructure.BLOCK_CELLS_Y; final int y = geoY / GeoStructure.BLOCK_CELLS_Y;
// if x or y is out of array return null // if x or y is out of array return null
if ((x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y)) if ((x > -1) && (y > -1) && (x < GeoStructure.GEO_BLOCKS_X) && (y < GeoStructure.GEO_BLOCKS_Y))
{ {
return _blocks[x][y]; return _blocks[x][y];
} }