Merge branch 'beta' into yaw_snappingyaw_snapping

2 files changed, 10 insertions, 1 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
index a7fc852e5..2096841bf 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
@@ -1,10 +1,12 @@
 package at.hannibal2.skyhanni.mixins.transformers.gui;
 
+import at.hannibal2.skyhanni.data.ToolTipData;
 import at.hannibal2.skyhanni.mixins.hooks.GuiContainerHook;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,6 +18,9 @@ public abstract class MixinGuiContainer extends GuiScreen {
     @Unique
     private final GuiContainerHook hook = new GuiContainerHook(this);
 
+    @Shadow
+    private Slot theSlot;
+
     @Inject(method = "keyTyped", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/EntityPlayerSP;closeScreen()V", shift = At.Shift.BEFORE), cancellable = true)
     private void closeWindowPressed(CallbackInfo ci) {
         hook.closeWindowPressed(ci);
@@ -55,5 +60,6 @@ public abstract class MixinGuiContainer extends GuiScreen {
     )
     public void drawScreen_after(int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {
         hook.onDrawScreenAfter(mouseX, mouseY, ci);
+        ToolTipData.Companion.setLastSlot(theSlot);
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiNewChat.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiNewChat.java
index 31a915b05..bdc0b01c2 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiNewChat.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiNewChat.java
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.mixins.transformers.gui;
 
 import at.hannibal2.skyhanni.SkyHanniMod;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiNewChat;
 import org.lwjgl.input.Keyboard;
 import org.spongepowered.asm.mixin.Mixin;
@@ -13,7 +14,9 @@ public class MixinGuiNewChat {
 
     @Inject(method = "getChatOpen", at = @At("HEAD"), cancellable = true)
     public void onIsOpen(CallbackInfoReturnable<Boolean> cir) {
-        if (SkyHanniMod.feature.chat.peekChat != Keyboard.KEY_NONE && Keyboard.isKeyDown(SkyHanniMod.feature.chat.peekChat))
+        if (SkyHanniMod.feature.chat.peekChat > Keyboard.KEY_NONE
+                && Minecraft.getMinecraft().thePlayer != null
+                && Keyboard.isKeyDown(SkyHanniMod.feature.chat.peekChat))
             cir.setReturnValue(true);
     }
 }