From 63f28066eb5e63ba79011f1d1bd2d5baf3488baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Pitteli=20Gon=C3=A7alves?= Date: Fri, 21 Feb 2025 19:56:40 -0300 Subject: [PATCH 1/3] fix network remote when break grid --- .../slimefun/tools/NetworkRemote.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java b/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java index d6e6889be..0e1bbead3 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java @@ -101,14 +101,20 @@ public static void tryOpenGrid(@Nonnull ItemStack itemStack, @Nonnull Player pla public static void openGrid(@Nonnull Location location, @Nonnull Player player) { SlimefunBlockData blockData = StorageCacheUtils.getBlock(location); - StorageCacheUtils.executeAfterLoad(blockData, () -> { - if (SlimefunItem.getById(blockData.getSfId()) instanceof NetworkGrid - && Slimefun.getProtectionManager().hasPermission(player, location, Interaction.INTERACT_BLOCK)) { - blockData.getBlockMenu().open(player); - } else { - player.sendMessage(Theme.ERROR + "无法找到绑定的网格"); - } - }, false); + + if(blockData == null) { + player.sendMessage(Theme.ERROR + "无法找到绑定的网格"); + } + else { + StorageCacheUtils.executeAfterLoad(blockData, () -> { + if (SlimefunItem.getById(blockData.getSfId()) instanceof NetworkGrid + && Slimefun.getProtectionManager().hasPermission(player, location, Interaction.INTERACT_BLOCK)) { + blockData.getBlockMenu().open(player); + } else { + player.sendMessage(Theme.ERROR + "无法找到绑定的网格"); + } + }, false); + } } public int getRange() { From 2f561b75334ce1c8b6fa39da01b566ee733a0cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Pitteli=20Gon=C3=A7alves?= Date: Sat, 22 Feb 2025 12:01:58 -0300 Subject: [PATCH 2/3] guard clause --- .../slimefun/tools/NetworkRemote.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java b/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java index 0e1bbead3..37da2e4de 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java @@ -104,17 +104,17 @@ public static void openGrid(@Nonnull Location location, @Nonnull Player player) if(blockData == null) { player.sendMessage(Theme.ERROR + "无法找到绑定的网格"); + return; } - else { - StorageCacheUtils.executeAfterLoad(blockData, () -> { - if (SlimefunItem.getById(blockData.getSfId()) instanceof NetworkGrid - && Slimefun.getProtectionManager().hasPermission(player, location, Interaction.INTERACT_BLOCK)) { - blockData.getBlockMenu().open(player); - } else { - player.sendMessage(Theme.ERROR + "无法找到绑定的网格"); - } - }, false); - } + + StorageCacheUtils.executeAfterLoad(blockData, () -> { + if (SlimefunItem.getById(blockData.getSfId()) instanceof NetworkGrid + && Slimefun.getProtectionManager().hasPermission(player, location, Interaction.INTERACT_BLOCK)) { + blockData.getBlockMenu().open(player); + } else { + player.sendMessage(Theme.ERROR + "无法找到绑定的网格"); + } + }, false); } public int getRange() { From b7a1e9385ebb650606f80210c0f754519eeb7053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Pitteli=20Gon=C3=A7alves?= Date: Sat, 22 Feb 2025 12:58:30 -0300 Subject: [PATCH 3/3] Update src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java Co-authored-by: ybw0014 --- .../github/sefiraat/networks/slimefun/tools/NetworkRemote.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java b/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java index 37da2e4de..119f81382 100644 --- a/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java +++ b/src/main/java/io/github/sefiraat/networks/slimefun/tools/NetworkRemote.java @@ -102,7 +102,7 @@ public static void tryOpenGrid(@Nonnull ItemStack itemStack, @Nonnull Player pla public static void openGrid(@Nonnull Location location, @Nonnull Player player) { SlimefunBlockData blockData = StorageCacheUtils.getBlock(location); - if(blockData == null) { + if (blockData == null) { player.sendMessage(Theme.ERROR + "无法找到绑定的网格"); return; }