Fixing

- a Player cannot pick up items when using /tpdeath - the inventory now opens for the right player when using /inventoryShow
CansteinBerlin · Jan 10, 2024 · 90b3b0d · 90b3b0d
1 parent 2f062df
commit 90b3b0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/me/cookieblaster/cansteinsupportutils/commands/InventoryShowCommand.java b/src/main/java/me/cookieblaster/cansteinsupportutils/commands/InventoryShowCommand.java
@@ -43,7 +43,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
             return true;
         }
 
-        Inventory showInventory = Bukkit.createInventory(null, 9 * 6, player.getName());
+        Inventory showInventory = Bukkit.createInventory(null, 9 * 6, player.getName() + "´s Inventory");
         for (int i = 0; i < 9; i++) {
             showInventory.setItem(9 * 3 + i, timedInventorySave.getInventory()[i]);
         }
@@ -54,7 +54,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
             showInventory.setItem(9 * 4 + 3 - (i % 9), timedInventorySave.getInventory()[i]);
         }
         showInventory.setItem(9 * 4 + 4, timedInventorySave.getInventory()[40]);
-        player.openInventory(showInventory);
+        ((Player) commandSender).openInventory(showInventory);
 
         commandSender.sendMessage(ConfigUtil.getPrefixedTrans("commands.inventoryShow.success", "player", strings[0]));
         return true;

diff --git a/src/main/java/me/cookieblaster/cansteinsupportutils/commands/TpDeathCommand.java b/src/main/java/me/cookieblaster/cansteinsupportutils/commands/TpDeathCommand.java
@@ -26,12 +26,14 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
                         if (lastDeathLocation != null) {
                             if (lastDeathLocation.getY() < -60) lastDeathLocation.setY(-60);
                             player.setVelocity(new Vector(0, 0, 0));
+                            player.setCanPickupItems(false);
                             player.teleport(lastDeathLocation.add(0.5, 0, 0.5));
                             player.sendMessage(ConfigUtil.getPrefixedTrans("commands.tpDeath.success", "player", deathPlayer.getName()));
                             (new BukkitRunnable() {
                                 @Override
                                 public void run() {
                                     player.setGameMode(GameMode.SPECTATOR);
+                                    player.setCanPickupItems(true);
                                 }
                             }).runTaskLater(CansteinSupportUtils.getInstance(), 5);
                         } else