From 743fc70a7f97f0cd9875c1e2cc2900c93db2717c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20Goossens?=
 <12281102+Aeltumn@users.noreply.github.com>
Date: Fri, 14 Feb 2020 21:04:38 +0100
Subject: [PATCH] Fix client not informing server when it attempts to interact
 with things, and is canceled by a client side handler.

---
 .../multiplayer/PlayerController.java.patch       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/patches/minecraft/net/minecraft/client/multiplayer/PlayerController.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/PlayerController.java.patch
index be89f59bf..535e42489 100644
--- a/patches/minecraft/net/minecraft/client/multiplayer/PlayerController.java.patch
+++ b/patches/minecraft/net/minecraft/client/multiplayer/PlayerController.java.patch
@@ -90,7 +90,7 @@
        }
  
        return p_178893_1_.equals(this.field_178895_c) && flag;
-@@ -256,13 +264,24 @@
+@@ -256,13 +264,27 @@
           return ActionResultType.FAIL;
        } else {
           ItemStack itemstack = p_217292_1_.func_184586_b(p_217292_3_);
@@ -108,7 +108,10 @@
 +            ItemUseContext itemusecontext = new ItemUseContext(p_217292_1_, p_217292_3_, p_217292_4_);
 +            if (event.getUseItem() != net.minecraftforge.eventbus.api.Event.Result.DENY) {
 +               ActionResultType result = itemstack.onItemUseFirst(itemusecontext);
-+               if (result != ActionResultType.PASS) return result;
++               if (result != ActionResultType.PASS) {
++                  this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
++                  return result;
++               }
 +            }
 +            boolean flag = !p_217292_1_.func_184614_ca().doesSneakBypassUse(p_217292_2_,blockpos,p_217292_1_) || !p_217292_1_.func_184592_cb().doesSneakBypassUse(p_217292_2_,blockpos,p_217292_1_);
              boolean flag1 = p_217292_1_.func_226563_dT_() && flag;
@@ -117,7 +120,7 @@
                 ActionResultType actionresulttype = p_217292_2_.func_180495_p(blockpos).func_227031_a_(p_217292_2_, p_217292_1_, p_217292_3_, p_217292_4_);
                 if (actionresulttype.func_226246_a_()) {
                    this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
-@@ -271,8 +290,8 @@
+@@ -271,8 +293,8 @@
              }
  
              this.field_78774_b.func_147297_a(new CPlayerTryUseItemOnBlockPacket(p_217292_3_, p_217292_4_));
@@ -127,7 +130,7 @@
                 ActionResultType actionresulttype1;
                 if (this.field_78779_k.func_77145_d()) {
                    int i = itemstack.func_190916_E();
-@@ -300,11 +319,14 @@
+@@ -300,11 +322,14 @@
           if (p_187101_1_.func_184811_cZ().func_185141_a(itemstack.func_77973_b())) {
              return ActionResultType.PASS;
           } else {
@@ -142,7 +145,7 @@
              }
  
              return actionresult.func_188397_a();
-@@ -329,6 +351,9 @@
+@@ -329,6 +354,9 @@
     public ActionResultType func_187097_a(PlayerEntity p_187097_1_, Entity p_187097_2_, Hand p_187097_3_) {
        this.func_78750_j();
        this.field_78774_b.func_147297_a(new CUseEntityPacket(p_187097_2_, p_187097_3_));
@@ -152,7 +155,7 @@
        return this.field_78779_k == GameType.SPECTATOR ? ActionResultType.PASS : p_187097_1_.func_190775_a(p_187097_2_, p_187097_3_);
     }
  
-@@ -336,6 +361,9 @@
+@@ -336,6 +364,9 @@
        this.func_78750_j();
        Vec3d vec3d = p_187102_3_.func_216347_e().func_178786_a(p_187102_2_.func_226277_ct_(), p_187102_2_.func_226278_cu_(), p_187102_2_.func_226281_cx_());
        this.field_78774_b.func_147297_a(new CUseEntityPacket(p_187102_2_, p_187102_4_, vec3d));