From 87a9e93278f1f73f952af5c486aa58f0f29ecfc3 Mon Sep 17 00:00:00 2001
From: Steveplays28 <djspaargaren@outlook.com>
Date: Mon, 14 Aug 2023 19:23:39 +0200
Subject: [PATCH] fix: Fix server trying to access client instance

---
 .../fullData/FullDataPointIdMap.java           | 18 +++++++-----------
 .../block/IBlockStateWrapper.java              |  4 ++--
 .../wrapperInterfaces/world/IBiomeWrapper.java |  3 +--
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java
index 66190fb09..65a951c57 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java
@@ -4,14 +4,14 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream;
 import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream;
+import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.io.*;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -257,7 +257,7 @@ public class FullDataPointIdMap
 			// cache the hash code to improve speed
 			if (this.hashCode == null)
 			{
-				this.hashCode = this.serialize().hashCode();
+				this.hashCode = this.serialize(this.biome.getLevelWrapper()).hashCode();
 			}
 
 			return this.hashCode;
@@ -273,21 +273,17 @@ public class FullDataPointIdMap
 				return false;
 			
 			Entry other = (Entry) otherObj;
-			return other.biome.serialize().equals(this.biome.serialize())
-					&& other.blockState.serialize().equals(this.blockState.serialize());
+			return other.biome.serialize(other.biome.getLevelWrapper()).equals(this.biome.serialize(this.biome.getLevelWrapper()))
+					&& other.blockState.serialize(other.blockState.getLevelWrapper()).equals(this.blockState.serialize(this.blockState.getLevelWrapper()));
 		}
 
 		@Override
 		public String toString() {
-			return this.serialize();
+			return this.serialize(this.biome.getLevelWrapper());
 		}
 		
 		public String serialize(ILevelWrapper levelWrapper) {
-			return this.biome.serialize(levelWrapper) + BLOCK_STATE_SEPARATOR_STRING + this.blockState.serialize(levelWrapper);
-		}
-
-		public String serialize() {
-			return this.biome.serialize() + BLOCK_STATE_SEPARATOR_STRING + this.blockState.serialize();
+			return this.biome.serialize(this.biome.getLevelWrapper()) + BLOCK_STATE_SEPARATOR_STRING + this.blockState.serialize(this.biome.getLevelWrapper());
 		}
 
 		public static Entry deserialize(String str, ILevelWrapper levelWrapper) throws IOException, InterruptedException
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/block/IBlockStateWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/block/IBlockStateWrapper.java
index d4229b95a..6b4b55944 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/block/IBlockStateWrapper.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/block/IBlockStateWrapper.java
@@ -7,8 +7,8 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 public interface IBlockStateWrapper extends IDhApiBlockStateWrapper
 {
     String serialize(ILevelWrapper levelWrapper);
-	// FIXME: Old code that might create a nullpointer exception
-	String serialize();
+
+	ILevelWrapper getLevelWrapper();
 
 	/**
 	 * Returning a value of 0 means the block is completely transparent. <br.
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IBiomeWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IBiomeWrapper.java
index ce51c2c27..1abfd7271 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IBiomeWrapper.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/world/IBiomeWrapper.java
@@ -30,6 +30,5 @@ public interface IBiomeWrapper extends IDhApiBiomeWrapper, IBindable
 {
 	String getName();
     String serialize(ILevelWrapper levelWrapper);
-	// FIXME: Old code that might create a nullpointer exception
-	String serialize();
+	ILevelWrapper getLevelWrapper();
 }