Merge remote-tracking branch 'origin/master'

This commit is contained in:
mfnalex 2022-03-07 23:01:25 +01:00
commit d946595923
2 changed files with 8 additions and 6 deletions

View File

@ -270,7 +270,7 @@
<dependency> <dependency>
<groupId>com.github.DeadSilenceIV</groupId> <groupId>com.github.DeadSilenceIV</groupId>
<artifactId>AdvancedChestsAPI</artifactId> <artifactId>AdvancedChestsAPI</artifactId>
<version>2.2</version> <version>2.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

View File

@ -6,6 +6,7 @@ import org.bukkit.inventory.Inventory;
import us.lynuxcraft.deadsilenceiv.advancedchests.AdvancedChestsAPI; import us.lynuxcraft.deadsilenceiv.advancedchests.AdvancedChestsAPI;
import us.lynuxcraft.deadsilenceiv.advancedchests.chest.AdvancedChest; import us.lynuxcraft.deadsilenceiv.advancedchests.chest.AdvancedChest;
import us.lynuxcraft.deadsilenceiv.advancedchests.chest.gui.page.ChestPage; import us.lynuxcraft.deadsilenceiv.advancedchests.chest.gui.page.ChestPage;
import us.lynuxcraft.deadsilenceiv.advancedchests.utils.inventory.InteractiveInventory;
public class AdvancedChestsHook { public class AdvancedChestsHook {
@ -31,12 +32,13 @@ public class AdvancedChestsHook {
public boolean handleAChestSortingIfPresent(Inventory inventory){ public boolean handleAChestSortingIfPresent(Inventory inventory){
if(!plugin.isHookAdvancedChests())return false; if(!plugin.isHookAdvancedChests())return false;
AdvancedChest chest = AdvancedChestsAPI.getInventoryManager().getAdvancedChest(inventory); InteractiveInventory interactiveInventory = AdvancedChestsAPI.getInventoryManager().getInteractiveByBukkit(inventory);
if(chest != null){ if(interactiveInventory != null) {
plugin.getOrganizer().sortInventory(inventory,0,inventory.getSize()-10); if (interactiveInventory instanceof ChestPage) {
plugin.getOrganizer().sortInventory(inventory, 0, inventory.getSize() - 10);
}
return true; return true;
} }else return false;
return false;
} }
public boolean handleAChestSortingIfPresent(Location location){ public boolean handleAChestSortingIfPresent(Location location){