From 9db2be0b4ed1dead1c2ea167bc07202b4ffc4dab Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 21 Mar 2022 11:43:30 -1000 Subject: [PATCH] Make the give notification message work for any player that has a server --- .../main/java/mezz/jei/util/CommandUtilServer.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Forge/src/main/java/mezz/jei/util/CommandUtilServer.java b/Forge/src/main/java/mezz/jei/util/CommandUtilServer.java index 731db3b98..a342c6db0 100644 --- a/Forge/src/main/java/mezz/jei/util/CommandUtilServer.java +++ b/Forge/src/main/java/mezz/jei/util/CommandUtilServer.java @@ -149,9 +149,9 @@ public static void mousePickupItemStack(Player sender, ItemStack itemStack) { giveCount = itemStack.getCount(); } - if (giveCount > 0 && sender instanceof ServerPlayer serverPlayerEntity) { + if (giveCount > 0) { itemStackCopy.setCount(giveCount); - notifyGive(serverPlayerEntity, itemStackCopy); + notifyGive(sender, itemStackCopy); containerMenu.broadcastChanges(); } } @@ -185,11 +185,14 @@ private static void giveToInventory(Player entityplayermp, ItemStack itemStack) notifyGive(entityplayermp, itemStackCopy); } - private static void notifyGive(Player entityPlayerMP, ItemStack stack) { - CommandSourceStack commandSource = entityPlayerMP.createCommandSourceStack(); + private static void notifyGive(Player player, ItemStack stack) { + if (player.getServer() == null) { + return; + } + CommandSourceStack commandSource = player.createCommandSourceStack(); int count = stack.getCount(); Component stackTextComponent = stack.getDisplayName(); - Component displayName = entityPlayerMP.getDisplayName(); + Component displayName = player.getDisplayName(); TranslatableComponent message = new TranslatableComponent("commands.give.success.single", count, stackTextComponent, displayName); commandSource.sendSuccess(message, true); }