Merge remote-tracking branch 'origin/develop' into snapshot

2020-06-28 22:07:49 +02:00
parent 7118d55d62 a4af8c2610
commit 5bf6773655
15 changed files with 238 additions and 265 deletions
--- a/src/main/java/com/replaymod/replay/camera/CameraEntity.java
+++ b/src/main/java/com/replaymod/replay/camera/CameraEntity.java
@@ -578,7 +578,7 @@ public class CameraEntity

    private void handleInputEvents() {
        if (this.client.options.keyAttack.wasPressed() || this.client.options.keyUse.wasPressed()) {
-            if (canSpectate(this.client.targetedEntity)) {
+            if (this.client.currentScreen == null && canSpectate(this.client.targetedEntity)) {
                ReplayModReplay.instance.getReplayHandler().spectateEntity(
                        //#if MC<=10710
                        //$$ (EntityLivingBase)