Skip to content

Instantly share code, notes, and snippets.

@Flow86

Flow86/EntityMinecart_1.4.0@52.patch

Created April 3, 2012 18:19
Show Gist options
  • Save Flow86/2294382 to your computer and use it in GitHub Desktop.
Save Flow86/2294382 to your computer and use it in GitHub Desktop.
Download ZIP
fix for forge 1.4.0@52 with lates mcp + forge-conf
Raw
EntityMinecart_1.4.0@52.patch
--- forge/patches/minecraft/net/minecraft/src/EntityMinecart.java.patch 0000-00-00 00:00:00.000000000 -0000
+++ forge/patches/minecraft/net/minecraft/src/EntityMinecart.java.patch 0000-00-00 00:00:00.000000000 -0000
@@ -256,9 +256,9 @@
- if (this.riddenByEntity != null)
- {
-- this.motionX *= 0.996999979019165D;
+- this.motionX *= 0.997D;
- this.motionY *= 0.0D;
-- this.motionZ *= 0.996999979019165D;
+- this.motionZ *= 0.997D;
- }
- else
- {
@@ -271,25 +271,25 @@
- this.pushX /= var38;
- this.pushZ /= var38;
- double var40 = 0.04D;
-- this.motionX *= 0.800000011920929D;
+- this.motionX *= 0.8D;
- this.motionY *= 0.0D;
-- this.motionZ *= 0.800000011920929D;
+- this.motionZ *= 0.8D;
- this.motionX += this.pushX * var40;
- this.motionZ += this.pushZ * var40;
- }
- else
- {
-- this.motionX *= 0.8999999761581421D;
+- this.motionX *= 0.9D;
- this.motionY *= 0.0D;
-- this.motionZ *= 0.8999999761581421D;
+- this.motionZ *= 0.9D;
- }
- }
-
-- this.motionX *= 0.9599999785423279D;
+- this.motionX *= 0.96D;
- this.motionY *= 0.0D;
-- this.motionZ *= 0.9599999785423279D;
+- this.motionZ *= 0.96D;
- }
-+ applyDragAndPushForces();
++ applyDragAndPushForces();
Vec3D var52 = this.func_514_g(this.posX, this.posY, this.posZ);
@@ -365,9 +365,9 @@
-
- if (!this.onGround)
- {
-- this.motionX *= 0.949999988079071D;
-- this.motionY *= 0.949999988079071D;
-- this.motionZ *= 0.949999988079071D;
+- this.motionX *= 0.95D;
+- this.motionY *= 0.95D;
+- this.motionZ *= 0.95D;
- }
+ moveMinecartOffRail(var1, var2, var3);
}
@@ -377,7 +377,7 @@
}
this.setRotation(this.rotationYaw, this.rotationPitch);
-- List var15 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand(0.20000000298023224D, 0.0D, 0.20000000298023224D));
+- List var15 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand(0.2D, 0.0D, 0.2D));
+
+ AxisAlignedBB box = null;
+ if (getCollisionHandler() != null)
@@ -507,17 +507,17 @@
- if (((EntityMinecart)par1Entity).minecartType == 2 && this.minecartType != 2)
+ if (((EntityMinecart)par1Entity).isPoweredCart() && !isPoweredCart())
{
- this.motionX *= 0.20000000298023224D;
- this.motionZ *= 0.20000000298023224D;
+ this.motionX *= 0.2D;
+ this.motionZ *= 0.2D;
@@ -946,7 +831,7 @@
- par1Entity.motionX *= 0.949999988079071D;
- par1Entity.motionZ *= 0.949999988079071D;
+ par1Entity.motionX *= 0.95D;
+ par1Entity.motionZ *= 0.95D;
}
- else if (((EntityMinecart)par1Entity).minecartType != 2 && this.minecartType == 2)
+ else if (!((EntityMinecart)par1Entity).isPoweredCart() && isPoweredCart())
{
- par1Entity.motionX *= 0.20000000298023224D;
- par1Entity.motionZ *= 0.20000000298023224D;
+ par1Entity.motionX *= 0.2D;
+ par1Entity.motionZ *= 0.2D;
@@ -981,7 +866,7 @@
*/
public int getSizeInventory()
--- forge/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch
+++ forge/patches/minecraft_server/net/minecraft/src/EntityMinecart.java.patch
@@ -256,9 +256,9 @@
- if (this.riddenByEntity != null)
- {
-- this.motionX *= 0.996999979019165D;
+- this.motionX *= 0.997D;
- this.motionY *= 0.0D;
-- this.motionZ *= 0.996999979019165D;
+- this.motionZ *= 0.997D;
- }
- else
- {
@@ -271,23 +271,23 @@
- this.pushX /= var38;
- this.pushZ /= var38;
- double var40 = 0.04D;
-- this.motionX *= 0.800000011920929D;
+- this.motionX *= 0.8D;
- this.motionY *= 0.0D;
-- this.motionZ *= 0.800000011920929D;
+- this.motionZ *= 0.8D;
- this.motionX += this.pushX * var40;
- this.motionZ += this.pushZ * var40;
- }
- else
- {
-- this.motionX *= 0.8999999761581421D;
+- this.motionX *= 0.9D;
- this.motionY *= 0.0D;
-- this.motionZ *= 0.8999999761581421D;
+- this.motionZ *= 0.9D;
- }
- }
-
-- this.motionX *= 0.9599999785423279D;
+- this.motionX *= 0.96D;
- this.motionY *= 0.0D;
-- this.motionZ *= 0.9599999785423279D;
+- this.motionZ *= 0.96D;
- }
+ applyDragAndPushForces();
@@ -365,9 +365,9 @@
-
- if (!this.onGround)
- {
-- this.motionX *= 0.949999988079071D;
-- this.motionY *= 0.949999988079071D;
-- this.motionZ *= 0.949999988079071D;
+- this.motionX *= 0.95D;
+- this.motionY *= 0.95D;
+- this.motionZ *= 0.95D;
- }
+ moveMinecartOffRail(var1, var2, var3);
}
@@ -377,7 +377,7 @@
}
this.setRotation(this.rotationYaw, this.rotationPitch);
-- List var15 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand(0.20000000298023224D, 0.0D, 0.20000000298023224D));
+- List var15 = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, this.boundingBox.expand(0.2D, 0.0D, 0.2D));
+
+ AxisAlignedBB box = null;
+ if (getCollisionHandler() != null)
@@ -490,17 +490,17 @@
- if (((EntityMinecart)par1Entity).minecartType == 2 && this.minecartType != 2)
+ if (((EntityMinecart)par1Entity).isPoweredCart() && !isPoweredCart())
{
- this.motionX *= 0.20000000298023224D;
- this.motionZ *= 0.20000000298023224D;
+ this.motionX *= 0.2D;
+ this.motionZ *= 0.2D;
@@ -873,7 +766,7 @@
- par1Entity.motionX *= 0.949999988079071D;
- par1Entity.motionZ *= 0.949999988079071D;
+ par1Entity.motionX *= 0.95D;
+ par1Entity.motionZ *= 0.95D;
}
- else if (((EntityMinecart)par1Entity).minecartType != 2 && this.minecartType == 2)
+ else if (!((EntityMinecart)par1Entity).isPoweredCart() && isPoweredCart())
{
- par1Entity.motionX *= 0.20000000298023224D;
- par1Entity.motionZ *= 0.20000000298023224D;
+ par1Entity.motionX *= 0.2D;
+ par1Entity.motionZ *= 0.2D;
@@ -908,7 +801,7 @@
*/
public int getSizeInventory()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment