From 669056401700c2feaa01dec99c6f2f1c75e4935d Mon Sep 17 00:00:00 2001
From: WinDanesz <31292708+WinDanesz@users.noreply.github.com>
Date: Sat, 5 Mar 2022 22:55:55 +0100
Subject: [PATCH] Fixed crash on dedicated servers (PacketSpellProperties),
 Fixes #780, #779, #773, #774, #771, #768

---
 .../packet/PacketSpellProperties.java         | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/electroblob/wizardry/packet/PacketSpellProperties.java b/src/main/java/electroblob/wizardry/packet/PacketSpellProperties.java
index b1ea515a..56dea451 100644
--- a/src/main/java/electroblob/wizardry/packet/PacketSpellProperties.java
+++ b/src/main/java/electroblob/wizardry/packet/PacketSpellProperties.java
@@ -21,9 +21,13 @@ public class PacketSpellProperties implements IMessageHandler<PacketSpellPropert
 
 			net.minecraft.client.Minecraft.getMinecraft().addScheduledTask(() -> {
 
-				int first = message.firstId;
-				for(int i = first; i <message.propertiesArray.length; i++){
-					Spell.byNetworkID(i).setPropertiesClient(message.propertiesArray[i]);
+				int spellId = message.firstId;
+
+				for(int i = 0; i <message.propertiesArray.length; i++){
+					Spell spell = Spell.byNetworkID(spellId);
+					SpellProperties props = message.propertiesArray[i];
+					spell.setPropertiesClient(props);
+					spellId++;
 				}
 			});
 		}
@@ -43,16 +47,22 @@ public class PacketSpellProperties implements IMessageHandler<PacketSpellPropert
 			this.firstId = firstId;
 			this.count = count;
 			this.propertiesArray = properties;
+
 		}
 
 		@Override
 		public void fromBytes(ByteBuf buf){
 			List<SpellProperties> propertiesList = new ArrayList<>();
-			int i = buf.readInt();
+			firstId = buf.readInt();
 			count = buf.readInt();
-			firstId = i;
-			while(buf.isReadable() && i < count){
-				propertiesList.add(new SpellProperties(Spell.byNetworkID(i++), buf));
+
+			int k = 0;
+			int j = firstId;
+			while(k < count){
+				SpellProperties props = new SpellProperties(Spell.byNetworkID(j), buf);
+				propertiesList.add(props);
+				k++;
+				j++;
 			}
 
 			propertiesArray = propertiesList.toArray(new SpellProperties[0]);