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

Merge pull request #926 from iChun/master

Browse source 
Fix erroneous position when getting player position with changed eye height.
This commit is contained in:
LexManos 2014-01-11 17:32:27 -08:00
commit 0296803fe3
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
View file

@ -479,11 +479,29 @@
chatcomponenttext.func_150256_b().func_150241_a(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/msg " + this.getCommandSenderName() + " ")); chatcomponenttext.func_150256_b().func_150241_a(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/msg " + this.getCommandSenderName() + " "));
return chatcomponenttext; return chatcomponenttext;
} }
@@ -2096,6 +2244,101 @@ @@ -2096,6 +2244,119 @@
FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z); FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
} }
+ /* ======================================== FORGE START =====================================*/ + /* ======================================== FORGE START =====================================*/
+ // JAVADOC METHOD $$ func_70666_h
+ @SideOnly(Side.CLIENT)
+ @Override
+ public Vec3 getPosition(float par1)
+ {
+ if (par1 == 1.0F)
+ {
+ return this.worldObj.getWorldVec3Pool().getVecFromPool(this.posX, this.posY + (this.getEyeHeight() - this.getDefaultEyeHeight()), this.posZ);
+ }
+ else
+ {
+ double d0 = this.prevPosX + (this.posX - this.prevPosX) * (double)par1;
+ double d1 = this.prevPosY + (this.posY - this.prevPosY) * (double)par1 + (this.getEyeHeight() - this.getDefaultEyeHeight());
+ double d2 = this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par1;
+ return this.worldObj.getWorldVec3Pool().getVecFromPool(d0, d1, d2);
+ }
+ }
+
+ /** + /**
+ * A dimension aware version of getBedLocation. + * A dimension aware version of getBedLocation.
+ * @param dimension The dimension to get the bed spawn for + * @param dimension The dimension to get the bed spawn for