From 065b66becb338c56f19e6fc4b979eeec0251becf Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 17 Feb 2020 09:23:02 +0000
Subject: [PATCH] Previous commit for other branches.

---
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 .../clientpackets/RequestExPledgeCrestLarge.java | 16 ++++++----------
 13 files changed, 78 insertions(+), 130 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
index 0ed866ee38..dd74925536 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -47,18 +47,14 @@ public class RequestExPledgeCrestLarge implements IClientIncomingPacket
 		{
 			for (int i = 0; i <= 4; i++)
 			{
-				if (i < 4)
+				final int size = Math.max(Math.min(14336, data.length - (14336 * i)), 0);
+				if (size == 0)
 				{
-					final byte[] fullChunk = new byte[14336];
-					System.arraycopy(data, (14336 * i), fullChunk, 0, 14336);
-					client.sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i));
-				}
-				else
-				{
-					final byte[] lastChunk = new byte[8320];
-					System.arraycopy(data, (14336 * i), lastChunk, 0, 8320);
-					client.sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i));
+					continue;
 				}
+				final byte[] chunk = new byte[size];
+				System.arraycopy(data, (14336 * i), chunk, 0, size);
+				client.sendPacket(new ExPledgeEmblem(_crestId, chunk, _clanId, i));
 			}
 		}
 	}