From 2a5ab9b1fce054e25af438c550328d7c18680a17 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Fri, 10 Apr 2020 14:16:09 +0100 Subject: $ Stop the Cape Renderer from cancelling the event unless they're invisible. Should fix Held Items being invisible. (Hopefully) --- .../xmod/gregtech/common/render/GTPP_CapeRenderer.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java index 9d8ecd55ff..77fc8d55d2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java @@ -80,14 +80,12 @@ public class GTPP_CapeRenderer extends RenderPlayer { // We have capes turned off, so let's not render. if (!ConfigSwitches.enableCustomCapes) { - aEvent.setCanceled(true); return; } // We have already checked if this player has a cape, but since they do not, we best not render. if (hasResourceChecked) { if (!hasCape && !CORE.DEVENV) { - aEvent.setCanceled(true); return; } } @@ -103,7 +101,6 @@ public class GTPP_CapeRenderer extends RenderPlayer { // If for whatever reason this fails, we just exit early. if (aPlayerUUID.equals("BAD")) { - aEvent.setCanceled(true); return; } @@ -164,14 +161,6 @@ public class GTPP_CapeRenderer extends RenderPlayer { hasResourceChecked = true; } - - // If player is invisible, don't render. - if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible() - || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) { - aEvent.setCanceled(true); - return; - } - if (hasResourceChecked) { // We have met all the conditions, let's render that cape. renderCapeOnPlayer(aEvent, aPlayer); @@ -186,6 +175,13 @@ public class GTPP_CapeRenderer extends RenderPlayer { if (tResource == null && CORE.DEVENV) { tResource = mCapes[3]; } + + // If player is invisible, don't render. + if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible() + || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) { + aEvent.setCanceled(true); + return false; + } if ((tResource != null) && (!aPlayer.getHideCape())) { bindTexture(tResource); -- cgit