keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix missing null checks in ForgeIngameGui (#6907)

Browse source
This commit is contained in:
Take Weiland 2020-07-06 22:06:31 +02:00 committed by GitHub
parent 68ea1b654c
commit df57e0a1ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/net/minecraftforge/client/gui/ForgeIngameGui.java
View file

@ -695,7 +695,7 @@ public class ForgeIngameGui extends IngameGui
protected void renderTitle(int width, int height, float partialTicks, MatrixStack mStack) protected void renderTitle(int width, int height, float partialTicks, MatrixStack mStack)
{ {
if (titlesTimer > 0) if (displayedTitle != null && titlesTimer > 0)
{ {
mc.getProfiler().startSection("titleAndSubtitle"); mc.getProfiler().startSection("titleAndSubtitle");
float age = (float)this.titlesTimer - partialTicks; float age = (float)this.titlesTimer - partialTicks;
@ -721,10 +721,13 @@ public class ForgeIngameGui extends IngameGui
int l = opacity << 24 & -16777216; int l = opacity << 24 & -16777216;
this.getFontRenderer().func_238407_a_(mStack, this.displayedTitle, (float)(-this.getFontRenderer().func_238414_a_(this.displayedTitle) / 2), -10.0F, 16777215 | l); this.getFontRenderer().func_238407_a_(mStack, this.displayedTitle, (float)(-this.getFontRenderer().func_238414_a_(this.displayedTitle) / 2), -10.0F, 16777215 | l);
RenderSystem.popMatrix(); RenderSystem.popMatrix();
if (this.displayedSubTitle != null)
{
RenderSystem.pushMatrix(); RenderSystem.pushMatrix();
RenderSystem.scalef(2.0F, 2.0F, 2.0F); RenderSystem.scalef(2.0F, 2.0F, 2.0F);
this.getFontRenderer().func_238407_a_(mStack, this.displayedSubTitle, (float)(-this.getFontRenderer().func_238414_a_(this.displayedSubTitle) / 2), 5.0F, 16777215 | l); this.getFontRenderer().func_238407_a_(mStack, this.displayedSubTitle, (float)(-this.getFontRenderer().func_238414_a_(this.displayedSubTitle) / 2), 5.0F, 16777215 | l);
RenderSystem.popMatrix(); RenderSystem.popMatrix();
}
RenderSystem.disableBlend(); RenderSystem.disableBlend();
RenderSystem.popMatrix(); RenderSystem.popMatrix();
} }