Try to fix region related log spam.

This commit is contained in:
MobiusDev
2018-04-02 23:23:53 +00:00
parent ec723bf305
commit 105776621a
12 changed files with 12 additions and 12 deletions

View File

@ -682,7 +682,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
{
final L2WorldRegion oldRegion = getWorldRegion();
final L2WorldRegion newRegion = L2World.getInstance().getRegion(this);
if (newRegion != oldRegion)
if ((newRegion != null) && (newRegion != oldRegion))
{
if (oldRegion != null)
{

View File

@ -734,7 +734,7 @@ public final class L2World
catch (ArrayIndexOutOfBoundsException e)
{
// TODO: Find when this can be null. (Bad geodata? Check GeoEngine hasGeoPos method.)
// _log.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
// LOGGER.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
return null;
}
}

View File

@ -682,7 +682,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
{
final L2WorldRegion oldRegion = getWorldRegion();
final L2WorldRegion newRegion = L2World.getInstance().getRegion(this);
if (newRegion != oldRegion)
if ((newRegion != null) && (newRegion != oldRegion))
{
if (oldRegion != null)
{

View File

@ -734,7 +734,7 @@ public final class L2World
catch (ArrayIndexOutOfBoundsException e)
{
// TODO: Find when this can be null. (Bad geodata? Check GeoEngine hasGeoPos method.)
// _log.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
// LOGGER.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
return null;
}
}

View File

@ -682,7 +682,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
{
final L2WorldRegion oldRegion = getWorldRegion();
final L2WorldRegion newRegion = L2World.getInstance().getRegion(this);
if (newRegion != oldRegion)
if ((newRegion != null) && (newRegion != oldRegion))
{
if (oldRegion != null)
{

View File

@ -734,7 +734,7 @@ public final class L2World
catch (ArrayIndexOutOfBoundsException e)
{
// TODO: Find when this can be null. (Bad geodata? Check GeoEngine hasGeoPos method.)
// _log.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
// LOGGER.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
return null;
}
}

View File

@ -682,7 +682,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
{
final L2WorldRegion oldRegion = getWorldRegion();
final L2WorldRegion newRegion = L2World.getInstance().getRegion(this);
if (newRegion != oldRegion)
if ((newRegion != null) && (newRegion != oldRegion))
{
if (oldRegion != null)
{

View File

@ -734,7 +734,7 @@ public final class L2World
catch (ArrayIndexOutOfBoundsException e)
{
// TODO: Find when this can be null. (Bad geodata? Check GeoEngine hasGeoPos method.)
// _log.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
// LOGGER.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
return null;
}
}

View File

@ -682,7 +682,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
{
final L2WorldRegion oldRegion = getWorldRegion();
final L2WorldRegion newRegion = L2World.getInstance().getRegion(this);
if (newRegion != oldRegion)
if ((newRegion != null) && (newRegion != oldRegion))
{
if (oldRegion != null)
{

View File

@ -734,7 +734,7 @@ public final class L2World
catch (ArrayIndexOutOfBoundsException e)
{
// TODO: Find when this can be null. (Bad geodata? Check GeoEngine hasGeoPos method.)
// _log.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
// LOGGER.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
return null;
}
}

View File

@ -682,7 +682,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab
{
final L2WorldRegion oldRegion = getWorldRegion();
final L2WorldRegion newRegion = L2World.getInstance().getRegion(this);
if (newRegion != oldRegion)
if ((newRegion != null) && (newRegion != oldRegion))
{
if (oldRegion != null)
{

View File

@ -734,7 +734,7 @@ public final class L2World
catch (ArrayIndexOutOfBoundsException e)
{
// TODO: Find when this can be null. (Bad geodata? Check GeoEngine hasGeoPos method.)
// _log.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
// LOGGER.warning(getClass().getSimpleName() + ": Incorrect world region X: " + ((x >> SHIFT_BY) + OFFSET_X) + " Y: " + ((y >> SHIFT_BY) + OFFSET_Y) + " Z: " + ((z >> SHIFT_BY_Z) + OFFSET_Z) + " for coordinates x: " + x + " y: " + y + " z: " + z);
return null;
}
}