minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Update to Minecraft 1.20 (#148)

Browse Source
This commit is contained in:
Adam
2023-06-10 11:06:41 -04:00
committed by GitHub
parent 70d20aceb6
commit cc7481fa9a
18 changed files with 64 additions and 1924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugin/src/main/java/com/lishid/openinv/InternalAccessor.java
View File

@@ -65,6 +65,7 @@ class InternalAccessor {
case "v1_16_R3" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.1.8";
case "v1_17_R1", "v1_18_R1" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.1.10";
case "v1_19_R1" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.2.2";
case "v1_18_R2", "v1_19_R2" -> "https://github.com/Jikoo/OpenInv/releases/tag/4.3.0";
default -> "https://github.com/Jikoo/OpenInv/releases";
};
}

7
plugin/src/main/java/com/lishid/openinv/InventoryListener.java
View File

@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.bukkit.GameMode;
import org.bukkit.block.Container;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -36,6 +35,7 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
import org.bukkit.event.inventory.InventoryInteractEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
@@ -54,9 +54,10 @@ record InventoryListener(OpenInv plugin) implements Listener {
return;
}
InventoryHolder holder = event.getInventory().getHolder();
if (this.plugin.getSilentContainerStatus(player)
&& event.getInventory().getHolder() instanceof Container container
&& this.plugin.getAnySilentContainer().isAnySilentContainer(container)) {
&& holder != null
&& this.plugin.getAnySilentContainer().isAnySilentContainer(holder)) {
this.plugin.getAnySilentContainer().deactivateContainer(player);
}