Change version to 1.1.1, fix bug with uncloseable inventory

Author: MinusKube

build.gradle

@@ -1,5 +1,5 @@
 group 'fr.minuskube.inv'
-version '1.1.0'
+version '1.1.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'

src/main/java/fr/minuskube/inv/SmartInventory.java

@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.Optional;
 
+@SuppressWarnings("unchecked")
 public class SmartInventory {
 
     private String id;
@@ -32,6 +33,17 @@ private SmartInventory() {}
     public Inventory open(Player player, int page) {
         InventoryManager manager = SmartInvsPlugin.manager();
 
+        Optional<SmartInventory> oldInv = manager.getInventory(player);
+
+        oldInv.ifPresent(inv -> {
+            inv.getListeners().stream()
+                    .filter(listener -> listener.getType() == InventoryCloseEvent.class)
+                    .forEach(listener -> ((InventoryListener<InventoryCloseEvent>) listener)
+                            .accept(new InventoryCloseEvent(player.getOpenInventory())));
+
+            manager.setInventory(player, null);
+        });
+
         InventoryContents contents = new InventoryContents.Impl(this);
         contents.pagination().page(page);
 
@@ -56,9 +68,9 @@ public void close(Player player) {
                 .forEach(listener -> ((InventoryListener<InventoryCloseEvent>) listener)
                         .accept(new InventoryCloseEvent(player.getOpenInventory())));
 
+        manager.setInventory(player, null);
         player.closeInventory();
 
-        manager.setInventory(player, null);
         manager.setContents(player, null);
     }
 

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: SmartInvs
-version: 1.1.0
+version: 1.1.1
 description: Inventory API for your Bukkit Plugins.
 author: MinusKube
 website: https://github.com/MinusKube/SmartInvs