From e7e88c480565e39cbba89bbaa5a1270542ba7dd7 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 13 Feb 2024 21:58:37 +0000 Subject: [PATCH] Fixed being able to select disabled races --- .../unicopia/client/gui/TribeConfirmationScreen.java | 9 +++++++++ .../unicopia/client/gui/TribeSelectionScreen.java | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/TribeConfirmationScreen.java b/src/main/java/com/minelittlepony/unicopia/client/gui/TribeConfirmationScreen.java index bc8ea6a8..a4a82e64 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/TribeConfirmationScreen.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/TribeConfirmationScreen.java @@ -28,6 +28,9 @@ public class TribeConfirmationScreen extends GameGui implements HidesHud { @Override protected void init() { + if (parent != null) { + parent.init(client, width, height); + } final int columnHeight = 167; final int columnWidth = 310; final int padding = 15; @@ -101,6 +104,12 @@ public class TribeConfirmationScreen extends GameGui implements HidesHud { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { + if (parent != null) { + context.getMatrices().push(); + context.getMatrices().translate(0, 0, -100); + parent.render(context, 0, 0, delta); + context.getMatrices().pop(); + } renderBackground(context); final int columnHeight = 180; diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/TribeSelectionScreen.java b/src/main/java/com/minelittlepony/unicopia/client/gui/TribeSelectionScreen.java index 6264eff9..3f046085 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/TribeSelectionScreen.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/TribeSelectionScreen.java @@ -157,7 +157,9 @@ public class TribeSelectionScreen extends GameGui implements HidesHud { return true; } if (keyCode == GLFW.GLFW_KEY_ENTER) { - options.get(SELECTION).onPress(); + if (options.get(SELECTION).active) { + options.get(SELECTION).onPress(); + } } return super.keyPressed(keyCode, scanCode, modifiers);