Fixed null pointer when removing anchor

FranciscoDadone · Jan 3, 2022 · aafcd28 · aafcd28
1 parent 8401b80
commit aafcd28
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/main/java/mc/nightmarephoenix/anchorsell/api/StorageManager.java b/src/main/java/mc/nightmarephoenix/anchorsell/api/StorageManager.java
@@ -436,7 +436,7 @@ public static void cacheAllAnchors() {
      * @return
      */
     public static Anchor getAnchorFromLoc(Location location) {
-        for(Anchor anchor: Global.getAllAnchors()) {
+        for(Anchor anchor : Global.getAllAnchors()) {
             if(anchor.getLocation().equals(location)) {
                 return anchor;
             }

diff --git a/src/main/java/mc/nightmarephoenix/anchorsell/events/AnchorBreak.java b/src/main/java/mc/nightmarephoenix/anchorsell/events/AnchorBreak.java
@@ -64,12 +64,6 @@ public void breakEv(BlockBreakEvent e) {
                                     location.getZ() +
                             ")");
 
-
-                    /**
-                     * Removes anchor from cache
-                     */
-                    Global.removeAnchor(anchor);
-
                     /**
                      * Playing sound on anchor break.
                      */
@@ -105,8 +99,12 @@ public void breakEv(BlockBreakEvent e) {
                      * Saves to the database the broken anchor.
                      */
                     StorageManager.removeAnchor(StorageManager.getAnchorFromLoc(location));
-                }
 
+                    /**
+                     * Removes anchor from cache
+                     */
+                    Global.removeAnchor(anchor);
+                }
             }, 20L);
         }
     }

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: AnchorSell
-version: 1.4.1
+version: 1.4.2
 main: mc.nightmarephoenix.anchorsell.AnchorSell
 api-version: 1.16
 depend: [ Vault, Essentials ]