From 2b22f885fb7c26148987a1ffa19cb2b90312db80 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 26 Mar 2018 20:47:45 +0000 Subject: [PATCH] Commented region debug messages. --- .../java/com/l2jmobius/gameserver/geoengine/GeoEngine.java | 3 ++- .../java/com/l2jmobius/gameserver/model/L2World.java | 3 ++- .../java/com/l2jmobius/gameserver/geoengine/GeoEngine.java | 3 ++- .../java/com/l2jmobius/gameserver/model/L2World.java | 3 ++- .../java/com/l2jmobius/gameserver/geoengine/GeoEngine.java | 3 ++- .../java/com/l2jmobius/gameserver/model/L2World.java | 3 ++- .../java/com/l2jmobius/gameserver/geoengine/GeoEngine.java | 3 ++- .../java/com/l2jmobius/gameserver/model/L2World.java | 3 ++- .../java/com/l2jmobius/gameserver/geoengine/GeoEngine.java | 3 ++- .../java/com/l2jmobius/gameserver/geoengine/GeoEngine.java | 3 ++- .../java/com/l2jmobius/gameserver/model/L2World.java | 3 ++- .../java/com/l2jmobius/gameserver/geoengine/GeoEngine.java | 3 ++- .../java/com/l2jmobius/gameserver/model/L2World.java | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index d348339145..eac0534ea6 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -299,7 +299,8 @@ public class GeoEngine final ABlock block = getBlock(geoX, geoY); if (block == null) // null block check { - _log.warning("Cound not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) + // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2World.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2World.java index 158f3283a1..11c5c3337f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2World.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2World.java @@ -771,7 +771,8 @@ public final class L2World } catch (ArrayIndexOutOfBoundsException e) { - _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); + // 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); return null; } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index d348339145..eac0534ea6 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -299,7 +299,8 @@ public class GeoEngine final ABlock block = getBlock(geoX, geoY); if (block == null) // null block check { - _log.warning("Cound not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) + // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2World.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2World.java index 158f3283a1..11c5c3337f 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2World.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2World.java @@ -771,7 +771,8 @@ public final class L2World } catch (ArrayIndexOutOfBoundsException e) { - _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); + // 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); return null; } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index d348339145..eac0534ea6 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -299,7 +299,8 @@ public class GeoEngine final ABlock block = getBlock(geoX, geoY); if (block == null) // null block check { - _log.warning("Cound not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) + // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2World.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2World.java index 158f3283a1..11c5c3337f 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2World.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2World.java @@ -771,7 +771,8 @@ public final class L2World } catch (ArrayIndexOutOfBoundsException e) { - _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); + // 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); return null; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index d348339145..eac0534ea6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -299,7 +299,8 @@ public class GeoEngine final ABlock block = getBlock(geoX, geoY); if (block == null) // null block check { - _log.warning("Cound not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) + // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2World.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2World.java index 158f3283a1..11c5c3337f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2World.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2World.java @@ -771,7 +771,8 @@ public final class L2World } catch (ArrayIndexOutOfBoundsException e) { - _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); + // 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); return null; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index 0a70275511..32c3728de3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -297,7 +297,8 @@ public class GeoEngine final ABlock block = getBlock(geoX, geoY); if (block == null) // null block check { - _log.warning("Cound not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // TODO: Find when this can be null. + // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index d348339145..eac0534ea6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -299,7 +299,8 @@ public class GeoEngine final ABlock block = getBlock(geoX, geoY); if (block == null) // null block check { - _log.warning("Cound not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) + // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2World.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2World.java index 158f3283a1..11c5c3337f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2World.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2World.java @@ -771,7 +771,8 @@ public final class L2World } catch (ArrayIndexOutOfBoundsException e) { - _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); + // 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); return null; } } diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java index d348339145..eac0534ea6 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/geoengine/GeoEngine.java @@ -299,7 +299,8 @@ public class GeoEngine final ABlock block = getBlock(geoX, geoY); if (block == null) // null block check { - _log.warning("Cound not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); + // TODO: Find when this can be null. (Bad geodata? Check L2World getRegion method.) + // _log.warning("Could not find geodata block at " + getWorldX(geoX) + ", " + getWorldY(geoY) + "."); return false; } return block.hasGeoPos(); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2World.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2World.java index 158f3283a1..11c5c3337f 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2World.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/L2World.java @@ -771,7 +771,8 @@ public final class L2World } catch (ArrayIndexOutOfBoundsException e) { - _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); + // 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); return null; } }