From 96b698dc851e050a124cb81974e3b7ae7afeeb28 Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 22 Mar 2012 19:44:12 -0700 Subject: [PATCH] Implemented Pheenixm pull request allowing for more control over the camera. --- .../minecraft/src/EntityRenderer.java.patch | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch index efde3588f..70be486e2 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch @@ -9,7 +9,34 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.Display; import org.lwjgl.opengl.GL11; -@@ -1106,8 +1108,11 @@ +@@ -287,8 +289,15 @@ + */ + private void updateFovModifierHand() + { +- EntityPlayerSP var1 = (EntityPlayerSP)this.mc.renderViewEntity; +- this.fovMultiplierTemp = var1.getFOVMultiplier(); ++ if (mc.renderViewEntity instanceof EntityPlayerSP) ++ { ++ EntityPlayerSP var1 = (EntityPlayerSP)this.mc.renderViewEntity; ++ this.fovMultiplierTemp = var1.getFOVMultiplier(); ++ } ++ else ++ { ++ this.fovMultiplierTemp = mc.thePlayer.getFOVMultiplier(); ++ } + this.fovModifierHandPrev = this.fovModifierHand; + this.fovModifierHand += (this.fovMultiplierTemp - this.fovModifierHand) * 0.5F; + } +@@ -304,7 +313,7 @@ + } + else + { +- EntityPlayer var3 = (EntityPlayer)this.mc.renderViewEntity; ++ EntityLiving var3 = (EntityLiving)this.mc.renderViewEntity; + float var4 = 70.0F; + + if (par2) +@@ -1106,8 +1115,11 @@ var20 = (EntityPlayer)var4; GL11.glDisable(GL11.GL_ALPHA_TEST); Profiler.endStartSection("outline"); @@ -23,7 +50,7 @@ GL11.glEnable(GL11.GL_ALPHA_TEST); } } -@@ -1171,8 +1176,12 @@ +@@ -1171,8 +1183,12 @@ var20 = (EntityPlayer)var4; GL11.glDisable(GL11.GL_ALPHA_TEST); Profiler.endStartSection("outline"); @@ -38,7 +65,7 @@ GL11.glEnable(GL11.GL_ALPHA_TEST); } -@@ -1196,6 +1205,9 @@ +@@ -1196,6 +1212,9 @@ this.setupFog(1, par1); GL11.glPopMatrix(); }