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

Item log formatter NPE fix.

Browse Source
This commit is contained in:
MobiusDev
2018-03-10 10:57:44 +00:00
parent e76017d359
commit f747e61acc
6 changed files with 126 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/log/formatter/ItemLogFormatter.java
View File

@@ -36,31 +36,32 @@ public class ItemLogFormatter extends Formatter
public String format(LogRecord record) public String format(LogRecord record)
{ {
final Object[] params = record.getParameters(); final Object[] params = record.getParameters();
final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params.length * 50), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage()); final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params != null ? params.length * 50 : 0), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
for (Object p : record.getParameters()) if (params != null)
{ {
if (p == null) for (Object p : params)
{ {
continue; if (p == null)
}
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{ {
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " "); continue;
} }
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " ");
}
StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")"); StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")");
} }
// else if (p instanceof L2PcInstance) else
// output.append(((L2PcInstance)p).getName()); {
else output.append(p.toString());
{ }
output.append(p.toString()/* + ":" + ((L2Object)p).getObjectId() */);
} }
} }
output.append(Config.EOL); output.append(Config.EOL);

39
L2J_Mobius_2.5_Underground/java/com/l2jmobius/log/formatter/ItemLogFormatter.java
View File

@@ -36,31 +36,32 @@ public class ItemLogFormatter extends Formatter
public String format(LogRecord record) public String format(LogRecord record)
{ {
final Object[] params = record.getParameters(); final Object[] params = record.getParameters();
final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params.length * 50), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage()); final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params != null ? params.length * 50 : 0), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
for (Object p : record.getParameters()) if (params != null)
{ {
if (p == null) for (Object p : params)
{ {
continue; if (p == null)
}
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{ {
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " "); continue;
} }
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " ");
}
StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")"); StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")");
} }
// else if (p instanceof L2PcInstance) else
// output.append(((L2PcInstance)p).getName()); {
else output.append(p.toString());
{ }
output.append(p.toString()/* + ":" + ((L2Object)p).getObjectId() */);
} }
} }
output.append(Config.EOL); output.append(Config.EOL);

39
L2J_Mobius_3.0_Helios/java/com/l2jmobius/log/formatter/ItemLogFormatter.java
View File

@@ -36,31 +36,32 @@ public class ItemLogFormatter extends Formatter
public String format(LogRecord record) public String format(LogRecord record)
{ {
final Object[] params = record.getParameters(); final Object[] params = record.getParameters();
final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params.length * 50), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage()); final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params != null ? params.length * 50 : 0), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
for (Object p : record.getParameters()) if (params != null)
{ {
if (p == null) for (Object p : params)
{ {
continue; if (p == null)
}
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{ {
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " "); continue;
} }
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " ");
}
StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")"); StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")");
} }
// else if (p instanceof L2PcInstance) else
// output.append(((L2PcInstance)p).getName()); {
else output.append(p.toString());
{ }
output.append(p.toString()/* + ":" + ((L2Object)p).getObjectId() */);
} }
} }
output.append(Config.EOL); output.append(Config.EOL);

39
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/log/formatter/ItemLogFormatter.java
View File

@@ -36,31 +36,32 @@ public class ItemLogFormatter extends Formatter
public String format(LogRecord record) public String format(LogRecord record)
{ {
final Object[] params = record.getParameters(); final Object[] params = record.getParameters();
final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params.length * 50), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage()); final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params != null ? params.length * 50 : 0), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
for (Object p : record.getParameters()) if (params != null)
{ {
if (p == null) for (Object p : params)
{ {
continue; if (p == null)
}
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{ {
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " "); continue;
} }
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " ");
}
StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")"); StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")");
} }
// else if (p instanceof L2PcInstance) else
// output.append(((L2PcInstance)p).getName()); {
else output.append(p.toString());
{ }
output.append(p.toString()/* + ":" + ((L2Object)p).getObjectId() */);
} }
} }
output.append(Config.EOL); output.append(Config.EOL);

39
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/log/formatter/ItemLogFormatter.java
View File

@@ -36,31 +36,32 @@ public class ItemLogFormatter extends Formatter
public String format(LogRecord record) public String format(LogRecord record)
{ {
final Object[] params = record.getParameters(); final Object[] params = record.getParameters();
final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params.length * 50), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage()); final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params != null ? params.length * 50 : 0), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
for (Object p : record.getParameters()) if (params != null)
{ {
if (p == null) for (Object p : params)
{ {
continue; if (p == null)
}
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{ {
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " "); continue;
} }
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " ");
}
StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")"); StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")");
} }
// else if (p instanceof L2PcInstance) else
// output.append(((L2PcInstance)p).getName()); {
else output.append(p.toString());
{ }
output.append(p.toString()/* + ":" + ((L2Object)p).getObjectId() */);
} }
} }
output.append(Config.EOL); output.append(Config.EOL);

39
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/log/formatter/ItemLogFormatter.java
View File

@@ -36,31 +36,32 @@ public class ItemLogFormatter extends Formatter
public String format(LogRecord record) public String format(LogRecord record)
{ {
final Object[] params = record.getParameters(); final Object[] params = record.getParameters();
final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params.length * 50), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage()); final StringBuilder output = StringUtil.startAppend(30 + record.getMessage().length() + (params != null ? params.length * 50 : 0), "[", dateFmt.format(new Date(record.getMillis())), "] ", record.getMessage());
for (Object p : record.getParameters()) if (params != null)
{ {
if (p == null) for (Object p : params)
{ {
continue; if (p == null)
}
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{ {
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " "); continue;
} }
output.append(", ");
if (p instanceof L2ItemInstance)
{
final L2ItemInstance item = (L2ItemInstance) p;
StringUtil.append(output, "item ", String.valueOf(item.getObjectId()), ":");
if (item.getEnchantLevel() > 0)
{
StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " ");
}
StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")"); StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")");
} }
// else if (p instanceof L2PcInstance) else
// output.append(((L2PcInstance)p).getName()); {
else output.append(p.toString());
{ }
output.append(p.toString()/* + ":" + ((L2Object)p).getObjectId() */);
} }
} }
output.append(Config.EOL); output.append(Config.EOL);