From 419b85a3ba483280c9128171be00a75759f1a649 Mon Sep 17 00:00:00 2001
From: Arav Singhal <singhal.arav@gmail.com>
Date: Sun, 11 Aug 2019 00:57:43 +0530
Subject: [PATCH] Add PersistedDataMap.of

---
 .../persistence/typeHandling/PersistedDataMap.java           | 5 +++++
 .../typeHandling/coreTypes/RuntimeDelegatingTypeHandler.java | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java b/engine/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java
index 9e7206eeb30..c11077eebf5 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/PersistedDataMap.java
@@ -15,6 +15,8 @@
  */
 package org.terasology.persistence.typeHandling;
 
+import org.terasology.persistence.typeHandling.inMemory.PersistedMap;
+
 import java.util.Map;
 import java.util.Set;
 
@@ -44,4 +46,7 @@ public interface PersistedDataMap extends PersistedData {
 
     Set<Map.Entry<String, PersistedData>> entrySet();
 
+    static PersistedDataMap of(Map<String, PersistedData> map) {
+        return new PersistedMap(map);
+    }
 }
diff --git a/engine/src/main/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandler.java b/engine/src/main/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandler.java
index 624e891cec9..a01f9bb4849 100644
--- a/engine/src/main/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandler.java
+++ b/engine/src/main/java/org/terasology/persistence/typeHandling/coreTypes/RuntimeDelegatingTypeHandler.java
@@ -212,7 +212,7 @@ public Optional<T> deserialize(PersistedData data) {
 
             valueFields.remove(TYPE_FIELD);
 
-            valueData = new PersistedMap(valueFields);
+            valueData = PersistedDataMap.of(valueFields);
         }
 
         return runtimeTypeHandler.deserialize(valueData);