Fixed block persistent data not being updated

Author: evyatar

PersistentDataAPI.iml

@@ -1,31 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>SPIGOT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_9">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
 </module>

src/main/java/me/thehandsomeyoni/persistentdataapi/manager/DataRegistry.java

@@ -80,7 +80,7 @@ public DataRegistry(Block block) throws UnacceptableBlockException, NullPointerE
         }
 
         this.blockState = (TileState) block.getState();
-        this.dataContainer = state.getPersistentDataContainer();
+        this.dataContainer = this.blockState.getPersistentDataContainer();
 
         this.manager = new DataContainerManager(dataContainer);
     }
@@ -108,6 +108,7 @@ public void registerData(String dataName, Serializable dataValue) throws DataExc
         }
 
         if (block != null) {
+            this.blockState.update();
             BlockPersistentDataWriteEvent event = new BlockPersistentDataWriteEvent(block, dataName, dataValue);
             getJavaPlugin().getServer().getPluginManager().callEvent(event);
         }
@@ -135,6 +136,7 @@ public void registerData(AbstractPersistentData data) throws DataException {
         }
 
         if (block != null) {
+            this.blockState.update();
             BlockPersistentDataWriteEvent event = new BlockPersistentDataWriteEvent(block, data);
             getJavaPlugin().getServer().getPluginManager().callEvent(event);
         }
@@ -161,6 +163,7 @@ public void unregisterData(String dataName) throws DataException {
         }
 
         if(block != null){
+            this.blockState.update();
             BlockPersistentDataDeleteEvent event = new BlockPersistentDataDeleteEvent(block, dataName);
             getJavaPlugin().getServer().getPluginManager().callEvent(event);
         }
@@ -188,6 +191,7 @@ public void unregisterData(AbstractPersistentData data) throws DataException {
         }
 
         if(block != null){
+            this.blockState.update();
             BlockPersistentDataDeleteEvent event = new BlockPersistentDataDeleteEvent(block, data);
             getJavaPlugin().getServer().getPluginManager().callEvent(event);
         }
@@ -211,6 +215,11 @@ public void setData(AbstractPersistentData data) {
             ItemPersistentDataWriteEvent event = new ItemPersistentDataWriteEvent(item, data);
             getJavaPlugin().getServer().getPluginManager().callEvent(event);
         }
+
+        if (block != null) {
+            this.blockState.update();
+            BlockPersistentDataWriteEvent event = new BlockPersistentDataWriteEvent(block, data);
+        }
     }
 
     /**
@@ -231,6 +240,11 @@ public void setData(String dataName, Serializable dataValue) {
             ItemPersistentDataWriteEvent event = new ItemPersistentDataWriteEvent(item, new PersistentData(dataName, dataValue));
             getJavaPlugin().getServer().getPluginManager().callEvent(event);
         }
+
+        if (block != null) {
+            this.blockState.update();
+            BlockPersistentDataWriteEvent event = new BlockPersistentDataWriteEvent(block, new PersistentData(dataName, dataValue));
+        }
     }
 
     /**