From 3953c8b3b248d01a50cac708dfe7366511e4496b Mon Sep 17 00:00:00 2001 From: Shadows_of_Fire Date: Thu, 28 Jun 2018 18:24:51 -0400 Subject: [PATCH] Properly send these events --- .../actuallyadditions/mod/util/WorldUtil.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java index 0949a8189..707bc1d72 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java @@ -190,17 +190,13 @@ public final class WorldUtil { //Everything else try { - if (world instanceof WorldServer) { - FakePlayer fake = FakePlayerFactory.getMinecraft((WorldServer) world); - ItemStack heldBefore = fake.getHeldItemMainhand(); - setHandItemWithoutAnnoyingSound(fake, EnumHand.MAIN_HAND, stack.copy()); - - fake.getHeldItemMainhand().onItemUse(fake, world, offsetPos, fake.getActiveHand(), side.getOpposite(), 0.5F, 0.5F, 0.5F); - - ItemStack result = fake.getHeldItem(EnumHand.MAIN_HAND); - setHandItemWithoutAnnoyingSound(fake, EnumHand.MAIN_HAND, heldBefore); - return result; - } + FakePlayer fake = FakePlayerFactory.getMinecraft((WorldServer) world); + ItemStack heldBefore = fake.getHeldItemMainhand(); + setHandItemWithoutAnnoyingSound(fake, EnumHand.MAIN_HAND, stack.copy()); + fake.interactionManager.processRightClickBlock(fake, world, fake.getHeldItemMainhand(), EnumHand.MAIN_HAND, offsetPos, side.getOpposite(), 0.5F, 0.5F, 0.5F); + ItemStack result = fake.getHeldItem(EnumHand.MAIN_HAND); + setHandItemWithoutAnnoyingSound(fake, EnumHand.MAIN_HAND, heldBefore); + return result; } catch (Exception e) { ActuallyAdditions.LOGGER.error("Something that places Blocks at " + offsetPos.getX() + ", " + offsetPos.getY() + ", " + offsetPos.getZ() + " in World " + world.provider.getDimension() + " threw an Exception! Don't let that happen again!", e); }