Reduce duplicate saves and fix for owner coming online for all versions

src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java

@@ -23,7 +23,7 @@ public interface ISpecialPlayerInventory {
 
     public Inventory getBukkitInventory();
 
-    public boolean inventoryRemovalCheck();
+    public boolean inventoryRemovalCheck(boolean save);
 
     public void setPlayerOnline(Player player);
 

src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_5_R2/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_5_R3/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_6_R1/SpecialPlayerInventory.java

@@ -51,18 +51,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -70,13 +73,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_6_R2/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_6_R3/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_7_R1/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_7_R2/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_7_R3/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_7_R4/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_8_R1/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_8_R2/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_8_R3/SpecialPlayerInventory.java

@@ -50,18 +50,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
     public void setPlayerOnline(Player player) {
         if (!playerOnline) {
-            CraftPlayer p = (CraftPlayer) player;
+            owner = (CraftPlayer) player;
-            p.getHandle().inventory.items = this.items;
+            this.player = owner.getHandle();
-            p.getHandle().inventory.armor = this.armor;
+            this.player.inventory.items = this.items;
-            p.saveData();
+            this.player.inventory.armor = this.armor;
             playerOnline = true;
         }
     }
@@ -69,13 +72,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override

src/main/java/com/lishid/openinv/internal/v1_9_R1/SpecialPlayerInventory.java

@@ -89,9 +89,12 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     }
 
     @Override
-    public boolean inventoryRemovalCheck() {
+    public boolean inventoryRemovalCheck(boolean save) {
+        boolean offline = transaction.isEmpty() && !playerOnline;
+        if (offline && save) {
             owner.saveData();
-        return transaction.isEmpty() && !playerOnline;
+        }
+        return offline;
     }
 
     @Override
@@ -100,7 +103,6 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
             owner = (CraftPlayer) player;
             this.player = owner.getHandle();
             setItemArrays(this.player.inventory, items, armor, extraSlots);
-            owner.saveData();
             playerOnline = true;
         }
     }
@@ -108,13 +110,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
     @Override
     public boolean setPlayerOffline() {
         playerOnline = false;
-        return this.inventoryRemovalCheck();
+        return this.inventoryRemovalCheck(false);
     }
 
     @Override
     public void onClose(CraftHumanEntity who) {
         super.onClose(who);
-        this.inventoryRemovalCheck();
+        this.inventoryRemovalCheck(true);
     }
 
     @Override