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

Fixed possible item log NPE.

Browse Source
This commit is contained in:
MobiusDev
2017-10-03 11:25:39 +00:00
parent 3c3b1fc8c3
commit e0da01c5b4
8 changed files with 108 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/datatables/ItemTable.java
View File

@@ -250,6 +250,8 @@ public class ItemTable
if (Config.LOG_ITEMS && !process.equals("Reset")) if (Config.LOG_ITEMS && !process.equals("Reset"))
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
{
if ((actor != null) && (reference != null)) // NPE check
{ {
if (item.getEnchantLevel() > 0) if (item.getEnchantLevel() > 0)
{ {
@@ -261,6 +263,7 @@ public class ItemTable
} }
} }
} }
}
if (actor != null) if (actor != null)
{ {

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
View File

@@ -326,6 +326,8 @@ public final class L2ItemInstance extends L2Object
if (Config.LOG_ITEMS) if (Config.LOG_ITEMS)
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID))))
{
if ((creator != null) && (reference != null))
{ {
if (getEnchantLevel() > 0) if (getEnchantLevel() > 0)
{ {
@@ -337,6 +339,7 @@ public final class L2ItemInstance extends L2Object
} }
} }
} }
}
if (creator != null) if (creator != null)
{ {
@@ -492,6 +495,8 @@ public final class L2ItemInstance extends L2Object
if (Config.LOG_ITEMS && (process != null)) if (Config.LOG_ITEMS && (process != null))
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID))))
{
if ((creator != null) && (reference != null))
{ {
if (getEnchantLevel() > 0) if (getEnchantLevel() > 0)
{ {
@@ -503,6 +508,7 @@ public final class L2ItemInstance extends L2Object
} }
} }
} }
}
if (creator != null) if (creator != null)
{ {

3
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/datatables/ItemTable.java
View File

@@ -250,6 +250,8 @@ public class ItemTable
if (Config.LOG_ITEMS && !process.equals("Reset")) if (Config.LOG_ITEMS && !process.equals("Reset"))
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
{
if ((actor != null) && (reference != null)) // NPE check
{ {
if (item.getEnchantLevel() > 0) if (item.getEnchantLevel() > 0)
{ {
@@ -261,6 +263,7 @@ public class ItemTable
} }
} }
} }
}
if (actor != null) if (actor != null)
{ {

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
View File

@@ -330,6 +330,8 @@ public final class L2ItemInstance extends L2Object
if (Config.LOG_ITEMS) if (Config.LOG_ITEMS)
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID))))
{
if ((creator != null) && (reference != null))
{ {
if (getEnchantLevel() > 0) if (getEnchantLevel() > 0)
{ {
@@ -341,6 +343,7 @@ public final class L2ItemInstance extends L2Object
} }
} }
} }
}
if (creator != null) if (creator != null)
{ {
@@ -496,6 +499,8 @@ public final class L2ItemInstance extends L2Object
if (Config.LOG_ITEMS && (process != null)) if (Config.LOG_ITEMS && (process != null))
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID))))
{
if ((creator != null) && (reference != null))
{ {
if (getEnchantLevel() > 0) if (getEnchantLevel() > 0)
{ {
@@ -507,6 +512,7 @@ public final class L2ItemInstance extends L2Object
} }
} }
} }
}
if (creator != null) if (creator != null)
{ {

3
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/datatables/ItemTable.java
View File

@@ -250,6 +250,8 @@ public class ItemTable
if (Config.LOG_ITEMS && !process.equals("Reset")) if (Config.LOG_ITEMS && !process.equals("Reset"))
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
{
if ((actor != null) && (reference != null)) // NPE check
{ {
if (item.getEnchantLevel() > 0) if (item.getEnchantLevel() > 0)
{ {
@@ -261,6 +263,7 @@ public class ItemTable
} }
} }
} }
}
if (actor != null) if (actor != null)
{ {

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
View File

@@ -330,6 +330,8 @@ public final class L2ItemInstance extends L2Object
if (Config.LOG_ITEMS) if (Config.LOG_ITEMS)
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID))))
{
if ((creator != null) && (reference != null))
{ {
if (getEnchantLevel() > 0) if (getEnchantLevel() > 0)
{ {
@@ -341,6 +343,7 @@ public final class L2ItemInstance extends L2Object
} }
} }
} }
}
if (creator != null) if (creator != null)
{ {
@@ -496,6 +499,8 @@ public final class L2ItemInstance extends L2Object
if (Config.LOG_ITEMS && (process != null)) if (Config.LOG_ITEMS && (process != null))
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID))))
{
if ((creator != null) && (reference != null))
{ {
if (getEnchantLevel() > 0) if (getEnchantLevel() > 0)
{ {
@@ -507,6 +512,7 @@ public final class L2ItemInstance extends L2Object
} }
} }
} }
}
if (creator != null) if (creator != null)
{ {

3
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/datatables/ItemTable.java
View File

@@ -250,6 +250,8 @@ public class ItemTable
if (Config.LOG_ITEMS && !process.equals("Reset")) if (Config.LOG_ITEMS && !process.equals("Reset"))
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (item.isEquipable() || (item.getId() == ADENA_ID))))
{
if ((actor != null) && (reference != null)) // NPE check
{ {
if (item.getEnchantLevel() > 0) if (item.getEnchantLevel() > 0)
{ {
@@ -261,6 +263,7 @@ public class ItemTable
} }
} }
} }
}
if (actor != null) if (actor != null)
{ {

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
View File

@@ -330,6 +330,8 @@ public final class L2ItemInstance extends L2Object
if (Config.LOG_ITEMS) if (Config.LOG_ITEMS)
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (getItem().isEquipable() || (getItem().getId() == ADENA_ID))))
{
if ((creator != null) && (reference != null))
{ {
if (getEnchantLevel() > 0) if (getEnchantLevel() > 0)
{ {
@@ -341,6 +343,7 @@ public final class L2ItemInstance extends L2Object
} }
} }
} }
}
if (creator != null) if (creator != null)
{ {
@@ -496,6 +499,8 @@ public final class L2ItemInstance extends L2Object
if (Config.LOG_ITEMS && (process != null)) if (Config.LOG_ITEMS && (process != null))
{ {
if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID))))
{
if ((creator != null) && (reference != null))
{ {
if (getEnchantLevel() > 0) if (getEnchantLevel() > 0)
{ {
@@ -507,6 +512,7 @@ public final class L2ItemInstance extends L2Object
} }
} }
} }
}
if (creator != null) if (creator != null)
{ {