Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement Cloneable just because we can, trim entity velocityY

Browse Source
This commit is contained in:
Olof Larsson 2013-03-13 08:23:37 +01:00
parent b324024c20
commit 92ac999c2e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/massivecraft/mcore/ps/PS.java
View File

@ -41,7 +41,7 @@ import com.massivecraft.mcore.xlib.gson.annotations.SerializedName;
* entity: world, locationX, locationY, locationZ, pitch, yaw, velocityX, velocityY, velocityZ * entity: world, locationX, locationY, locationZ, pitch, yaw, velocityX, velocityY, velocityZ
*/ */
public final class PS implements Serializable public final class PS implements Cloneable, Serializable
{ {
// -------------------------------------------- // // -------------------------------------------- //
// CONSTANTS // CONSTANTS
@ -282,7 +282,7 @@ public final class PS implements Serializable
Vector velocity = entity.getVelocity(); Vector velocity = entity.getVelocity();
Double velocityX = velocity.getX(); Double velocityX = velocity.getX();
Double velocityY = velocity.getY(); Double velocityY = trimEntityVelocityY(velocity.getY());
Double velocityZ = velocity.getZ(); Double velocityZ = velocity.getZ();
return valueOf(world, null, null, null, locationX, locationY, locationZ, null, null, pitch, yaw, velocityX, velocityY, velocityZ); return valueOf(world, null, null, null, locationX, locationY, locationZ, null, null, pitch, yaw, velocityX, velocityY, velocityZ);
@ -638,6 +638,17 @@ public final class PS implements Serializable
return world.getName(); return world.getName();
} }
// Because of something in the physics engine players actually
// have a small negative velocityY even when standing still.
// We remove this redundant small negative value.
public static Double trimEntityVelocityY(Double velocityY)
{
if (velocityY == null) return null;
if (velocityY >= 0) return velocityY;
if (velocityY < -0.1D) return velocityY;
return 0D;
}
// -------------------------------------------- // // -------------------------------------------- //
// TO STRING // TO STRING
// -------------------------------------------- // // -------------------------------------------- //
@ -874,11 +885,11 @@ public final class PS implements Serializable
// -------------------------------------------- // // -------------------------------------------- //
// CLONE // CLONE
// -------------------------------------------- // // -------------------------------------------- //
/*
@Override @Override
public PS clone() public PS clone()
{ {
return this; return this;
}*/ }
} }