forked from Automat-GH/minecrift
-
-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix things.
- Loading branch information
Showing
14 changed files
with
260 additions
and
83 deletions.
There are no files selected for viewing
Submodule JMumbleLink
deleted from
9250ba
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 13 additions & 1 deletion
14
patches/net/minecraft/client/entity/EntityClientPlayerMP.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
patches/net/minecraft/network/play/client/C03PacketPlayer.java.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| --- a/net/minecraft/network/play/client/C03PacketPlayer.java | ||
| +++ b/net/minecraft/network/play/client/C03PacketPlayer.java | ||
| @@ -14,7 +14,7 @@ | ||
| protected double stance; | ||
| protected float yaw; | ||
| protected float pitch; | ||
| - protected boolean field_149474_g; | ||
| + protected boolean grounded; | ||
| protected boolean field_149480_h; | ||
| protected boolean rotating; | ||
| private static final String __OBFID = "CL_00001360"; | ||
| @@ -23,7 +23,7 @@ | ||
|
|
||
| public C03PacketPlayer(boolean p_i45256_1_) | ||
| { | ||
| - this.field_149474_g = p_i45256_1_; | ||
| + this.grounded = p_i45256_1_; | ||
| } | ||
|
|
||
| /** | ||
| @@ -39,7 +39,7 @@ | ||
| */ | ||
| public void readPacketData(PacketBuffer data) throws IOException | ||
| { | ||
| - this.field_149474_g = data.readUnsignedByte() != 0; | ||
| + this.grounded = data.readUnsignedByte() != 0; | ||
| } | ||
|
|
||
| /** | ||
| @@ -47,7 +47,7 @@ | ||
| */ | ||
| public void writePacketData(PacketBuffer data) throws IOException | ||
| { | ||
| - data.writeByte(this.field_149474_g ? 1 : 0); | ||
| + data.writeByte(this.grounded ? 1 : 0); | ||
| } | ||
|
|
||
| public double getPositionX() | ||
| @@ -82,7 +82,7 @@ | ||
|
|
||
| public boolean func_149465_i() | ||
| { | ||
| - return this.field_149474_g; | ||
| + return this.grounded; | ||
| } | ||
|
|
||
| public boolean func_149466_j() | ||
| @@ -123,7 +123,7 @@ | ||
| this.y = p_i45253_3_; | ||
| this.stance = p_i45253_5_; | ||
| this.z = p_i45253_7_; | ||
| - this.field_149474_g = p_i45253_9_; | ||
| + this.grounded = p_i45253_9_; | ||
| this.field_149480_h = true; | ||
| } | ||
|
|
||
| @@ -164,7 +164,7 @@ | ||
| { | ||
| this.yaw = p_i45255_1_; | ||
| this.pitch = p_i45255_2_; | ||
| - this.field_149474_g = p_i45255_3_; | ||
| + this.grounded = p_i45255_3_; | ||
| this.rotating = true; | ||
| } | ||
|
|
||
| @@ -206,7 +206,7 @@ | ||
| this.z = p_i45254_7_; | ||
| this.yaw = p_i45254_9_; | ||
| this.pitch = p_i45254_10_; | ||
| - this.field_149474_g = p_i45254_11_; | ||
| + this.grounded = p_i45254_11_; | ||
| this.rotating = true; | ||
| this.field_149480_h = true; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| --- a/net/minecraft/util/FoodStats.java | ||
| +++ b/net/minecraft/util/FoodStats.java | ||
| @@ -39,9 +39,9 @@ | ||
| /** | ||
| * Handles the food game logic. | ||
| */ | ||
| - public void onUpdate(EntityPlayer p_75118_1_) | ||
| + public void onUpdate(EntityPlayer player) | ||
| { | ||
| - EnumDifficulty var2 = p_75118_1_.worldObj.difficultySetting; | ||
| + EnumDifficulty var2 = player.worldObj.difficultySetting; | ||
| this.prevFoodLevel = this.foodLevel; | ||
|
|
||
| if (this.foodExhaustionLevel > 4.0F) | ||
| @@ -58,13 +58,13 @@ | ||
| } | ||
| } | ||
|
|
||
| - if (p_75118_1_.worldObj.getGameRules().getGameRuleBooleanValue("naturalRegeneration") && this.foodLevel >= 18 && p_75118_1_.shouldHeal()) | ||
| + if (player.worldObj.getGameRules().getGameRuleBooleanValue("naturalRegeneration") && this.foodLevel >= 18 && player.shouldHeal()) | ||
| { | ||
| ++this.foodTimer; | ||
|
|
||
| if (this.foodTimer >= 80) | ||
| { | ||
| - p_75118_1_.heal(1.0F); | ||
| + player.heal(1.0F); | ||
| this.addExhaustion(3.0F); | ||
| this.foodTimer = 0; | ||
| } | ||
| @@ -75,9 +75,9 @@ | ||
|
|
||
| if (this.foodTimer >= 80) | ||
| { | ||
| - if (p_75118_1_.getHealth() > 10.0F || var2 == EnumDifficulty.HARD || p_75118_1_.getHealth() > 1.0F && var2 == EnumDifficulty.NORMAL) | ||
| + if (player.getHealth() > 10.0F || var2 == EnumDifficulty.HARD || player.getHealth() > 1.0F && var2 == EnumDifficulty.NORMAL) | ||
| { | ||
| - p_75118_1_.attackEntityFrom(DamageSource.starve, 1.0F); | ||
| + player.attackEntityFrom(DamageSource.starve, 1.0F); | ||
| } | ||
|
|
||
| this.foodTimer = 0; |
Oops, something went wrong.