diff --git a/api/pom.xml b/api/pom.xml
index d12f1ee..bdfde51 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvapi</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 1c4f633..40916ae 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvassembly</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
index 35face4..f249c1c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvcommon</artifactId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvapi</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/1_4_5/pom.xml b/internal/1_4_5/pom.xml
index 155cc14..6d6774c 100644
--- a/internal/1_4_5/pom.xml
+++ b/internal/1_4_5/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_4_5</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/1_4_6/pom.xml b/internal/1_4_6/pom.xml
index 2789440..528affe 100644
--- a/internal/1_4_6/pom.xml
+++ b/internal/1_4_6/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_4_6</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/pom.xml b/internal/pom.xml
index 010a9e8..aa3f4a6 100644
--- a/internal/pom.xml
+++ b/internal/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvinternal</artifactId>
diff --git a/internal/v1_10_R1/pom.xml b/internal/v1_10_R1/pom.xml
index 00b83d7..b6753d4 100644
--- a/internal/v1_10_R1/pom.xml
+++ b/internal/v1_10_R1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_10_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_11_R1/pom.xml b/internal/v1_11_R1/pom.xml
index 90a10e0..3877c19 100644
--- a/internal/v1_11_R1/pom.xml
+++ b/internal/v1_11_R1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_11_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_12_R1/pom.xml b/internal/v1_12_R1/pom.xml
index f9edc95..34f0fb9 100644
--- a/internal/v1_12_R1/pom.xml
+++ b/internal/v1_12_R1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_12_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_13_R1/pom.xml b/internal/v1_13_R1/pom.xml
index 923b822..7fae102 100644
--- a/internal/v1_13_R1/pom.xml
+++ b/internal/v1_13_R1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_13_R1</artifactId>
@@ -31,13 +31,13 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.13-pre7-R0.1-SNAPSHOT</version>
+      <version>1.13-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/PlayerDataManager.java b/internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/PlayerDataManager.java
index 079a3ff..73db1d0 100644
--- a/internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/PlayerDataManager.java
+++ b/internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/PlayerDataManager.java
@@ -97,7 +97,7 @@ public class PlayerDataManager implements IPlayerDataManager {
                 new PlayerInteractManager(server.getWorldServer(0)));
 
         // Get the bukkit entity
-        Player target = entity == null ? null : entity.getBukkitEntity();
+        Player target = entity.getBukkitEntity();
         if (target != null) {
             // Load data
             target.loadData();
diff --git a/internal/v1_4_R1/pom.xml b/internal/v1_4_R1/pom.xml
index 4b1dfb3..4e51c6f 100644
--- a/internal/v1_4_R1/pom.xml
+++ b/internal/v1_4_R1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_4_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_5_R2/pom.xml b/internal/v1_5_R2/pom.xml
index 10182ca..a80d269 100644
--- a/internal/v1_5_R2/pom.xml
+++ b/internal/v1_5_R2/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_5_R3/pom.xml b/internal/v1_5_R3/pom.xml
index 4af0763..6907d6a 100644
--- a/internal/v1_5_R3/pom.xml
+++ b/internal/v1_5_R3/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_5_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_6_R1/pom.xml b/internal/v1_6_R1/pom.xml
index 8177819..4a9cc52 100644
--- a/internal/v1_6_R1/pom.xml
+++ b/internal/v1_6_R1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_6_R2/pom.xml b/internal/v1_6_R2/pom.xml
index 1b680d6..ea30c2d 100644
--- a/internal/v1_6_R2/pom.xml
+++ b/internal/v1_6_R2/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_6_R3/pom.xml b/internal/v1_6_R3/pom.xml
index e44e79f..2dc9fe7 100644
--- a/internal/v1_6_R3/pom.xml
+++ b/internal/v1_6_R3/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_6_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_7_R1/pom.xml b/internal/v1_7_R1/pom.xml
index 6789ab5..f874325 100644
--- a/internal/v1_7_R1/pom.xml
+++ b/internal/v1_7_R1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_7_R2/pom.xml b/internal/v1_7_R2/pom.xml
index 6452a86..34f6643 100644
--- a/internal/v1_7_R2/pom.xml
+++ b/internal/v1_7_R2/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_7_R3/pom.xml b/internal/v1_7_R3/pom.xml
index 292b949..962a21a 100644
--- a/internal/v1_7_R3/pom.xml
+++ b/internal/v1_7_R3/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_7_R4/pom.xml b/internal/v1_7_R4/pom.xml
index 971b6c8..0cdb9bf 100644
--- a/internal/v1_7_R4/pom.xml
+++ b/internal/v1_7_R4/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_7_R4</artifactId>
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_8_R1/pom.xml b/internal/v1_8_R1/pom.xml
index 5c0f627..ee5014d 100644
--- a/internal/v1_8_R1/pom.xml
+++ b/internal/v1_8_R1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_8_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_8_R2/pom.xml b/internal/v1_8_R2/pom.xml
index f904739..de80076 100644
--- a/internal/v1_8_R2/pom.xml
+++ b/internal/v1_8_R2/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_8_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_8_R3/pom.xml b/internal/v1_8_R3/pom.xml
index 72d1374..64e72a5 100644
--- a/internal/v1_8_R3/pom.xml
+++ b/internal/v1_8_R3/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_8_R3</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/internal/v1_9_R1/pom.xml b/internal/v1_9_R1/pom.xml
index b0755bf..0f75dd8 100644
--- a/internal/v1_9_R1/pom.xml
+++ b/internal/v1_9_R1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_9_R1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/internal/v1_9_R2/pom.xml b/internal/v1_9_R2/pom.xml
index cb496f4..04803e7 100644
--- a/internal/v1_9_R2/pom.xml
+++ b/internal/v1_9_R2/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvinternal</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvadapter1_9_R2</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/plugin/plugin-core/pom.xml b/plugin/plugin-core/pom.xml
index a014a58..7460753 100644
--- a/plugin/plugin-core/pom.xml
+++ b/plugin/plugin-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvplugin</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvplugincore</artifactId>
@@ -38,12 +38,12 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvpluginv1_10_r1</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/plugin/plugin-v1_10_R1/pom.xml b/plugin/plugin-v1_10_R1/pom.xml
index 49df53f..aef37bb 100644
--- a/plugin/plugin-v1_10_R1/pom.xml
+++ b/plugin/plugin-v1_10_R1/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvplugin</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvpluginv1_10_r1</artifactId>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.lishid</groupId>
       <artifactId>openinvcommon</artifactId>
-      <version>3.3.4-A1</version>
+      <version>3.3.4</version>
     </dependency>
   </dependencies>
 
diff --git a/plugin/pom.xml b/plugin/pom.xml
index aba75da..10a71c5 100644
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.lishid</groupId>
     <artifactId>openinvparent</artifactId>
-    <version>3.3.4-A1</version>
+    <version>3.3.4</version>
   </parent>
 
   <artifactId>openinvplugin</artifactId>
diff --git a/pom.xml b/pom.xml
index b2adaed..98e67ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <artifactId>openinvparent</artifactId>
   <name>OpenInvParent</name>
   <url>http://dev.bukkit.org/bukkit-plugins/openinv/</url>
-  <version>3.3.4-A1</version>
+  <version>3.3.4</version>
 
   <packaging>pom</packaging>