Merge remote-tracking branch 'origin/folia' into folia

CoPokBl · Jun 21, 2024 · 264450c · 264450c
2 parents 4f2696a + 2acd27e
commit 264450c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/net/serble/estools/Commands/Back.java b/src/main/java/net/serble/estools/Commands/Back.java
@@ -58,7 +58,7 @@ public void executeEvent(EsEvent event) {
 		if (event instanceof EsPlayerTeleportEvent) {
 			EsPlayerTeleportEvent e = (EsPlayerTeleportEvent) event;
 			if (Main.minecraftVersion.getMinor() > 9 &&
-					!equalsOr(e.getCause(), EsTeleportCause.Command, EsTeleportCause.Plugin)) {
+					!equalsOr(e.getCause(), EsTeleportCause.Command, EsTeleportCause.Plugin, EsTeleportCause.Unknown)) {
 				return;
 			}
 			prevLocations.put(e.getPlayer().getUniqueId(), e.getPlayer().getLocation());

diff --git a/src/main/java/net/serble/estools/ServerApi/Implementations/Bukkit/BukkitInventoryView.java b/src/main/java/net/serble/estools/ServerApi/Implementations/Bukkit/BukkitInventoryView.java
@@ -27,7 +27,7 @@ public EsInventory getBottomInventory() {
 
     @Override
     public EsInventory getInventory(int slot) {
-        if (Main.minecraftVersion.getMinor() <= 7) {  // .getInventory(slot) doesn't exist
+        if (Main.minecraftVersion.getMinor() <= 10) {  // .getInventory(slot) doesn't exist
             if (slot >= getTopInventory().getSize()) {  // Bottom inv
                 return getBottomInventory();
             }