From 75e0e632a4c1fb827a2e0182d5ecc6f172542a1e Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 10 Mar 2020 23:51:21 +0000
Subject: [PATCH] Log when SystemMessage has SystemMessageId with null
 parameter.

---
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 .../gameserver/network/serverpackets/SystemMessage.java   | 8 +++++++-
 15 files changed, 105 insertions(+), 15 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 325912ab30..4083957ea0 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -393,7 +393,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -406,7 +405,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 325912ab30..4083957ea0 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -393,7 +393,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -406,7 +405,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 1d554e2aca..1558e3b7ea 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -400,7 +400,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -413,7 +412,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 1d554e2aca..1558e3b7ea 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -400,7 +400,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -413,7 +412,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 1d554e2aca..1558e3b7ea 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -400,7 +400,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -413,7 +412,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 1d554e2aca..1558e3b7ea 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -400,7 +400,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -413,7 +412,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 1d554e2aca..1558e3b7ea 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -400,7 +400,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -413,7 +412,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 1d554e2aca..1558e3b7ea 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -400,7 +400,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -413,7 +412,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 1d554e2aca..1558e3b7ea 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -400,7 +400,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -413,7 +412,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 1d554e2aca..1558e3b7ea 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -400,7 +400,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -413,7 +412,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 1d554e2aca..1558e3b7ea 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -400,7 +400,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -413,7 +412,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 722e70f51a..36b5a39fec 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -407,7 +407,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -420,7 +419,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 722e70f51a..36b5a39fec 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -407,7 +407,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -420,7 +419,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 722e70f51a..36b5a39fec 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -407,7 +407,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -420,7 +419,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME:
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 1d554e2aca..1558e3b7ea 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -400,7 +400,6 @@ public class SystemMessage implements IClientOutgoingPacket
 				{
 					params[i] = _params[i].getValue();
 				}
-				
 				packet.writeH(SystemMessageId.S1_2.getId());
 				packet.writeC(0x01);
 				packet.writeC(TYPE_TEXT);
@@ -413,7 +412,14 @@ public class SystemMessage implements IClientOutgoingPacket
 		packet.writeC(_params.length);
 		for (SMParam param : _params)
 		{
+			if (param == null)
+			{
+				LOGGER.warning("Found null parameter for SystemMessageId " + _smId);
+				continue;
+			}
+			
 			packet.writeC(param.getType());
+			
 			switch (param.getType())
 			{
 				case TYPE_ELEMENT_NAME: