Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring: store entity position as double

Browse source
This commit is contained in:
Disasm 2013-07-09 21:33:33 +04:00
parent 7d8a2d8af2
commit fc2a565ca2
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/cr0s/WarpDrive/EntityJump.java
View file

@ -198,11 +198,11 @@ public class EntityJump extends Entity {
if (entity instanceof EntityPlayer) {
if (!removeBlocks) {
mySetBlock(worldObj, me.oldX, me.oldY - 2, me.oldZ, Block.dirt.blockID, 0, 1 + 2);
mySetBlock(worldObj, (int)me.oldX, (int)me.oldY - 2, (int)me.oldZ, Block.dirt.blockID, 0, 1 + 2);
} else
{
if (worldObj.getBlockId(me.oldX, me.oldY - 2, me.oldZ) == Block.dirt.blockID) {
mySetBlock(worldObj, me.oldX, me.oldY - 2, me.oldZ, 0, 0, 1 + 2);
if (worldObj.getBlockId((int)me.oldX, (int)me.oldY - 2, (int)me.oldZ) == Block.dirt.blockID) {
mySetBlock(worldObj, (int)me.oldX, (int)me.oldY - 2, (int)me.oldZ, 0, 0, 1 + 2);
}
}
}
@ -507,7 +507,7 @@ public class EntityJump extends Entity {
Entity entity = (Entity)o;
MovingEntity movingentity = new MovingEntity(entity, MathHelper.floor_double(entity.posX), MathHelper.floor_double(entity.posY), MathHelper.floor_double(entity.posZ));
MovingEntity movingentity = new MovingEntity(entity, entity.posX, entity.posY, entity.posZ);
// Добавим в список Entity
entityOnShip.add(movingentity);
@ -537,9 +537,10 @@ public class EntityJump extends Entity {
if (me == null) { continue; }
int oldEntityX = me.oldX;
int oldEntityY = me.oldY;
int oldEntityZ = me.oldZ;
// TODO: пересчитывать всё в вещественных координатах
int oldEntityX = (int)me.oldX;
int oldEntityY = (int)me.oldY;
int oldEntityZ = (int)me.oldZ;
int newEntityX, newEntityY, newEntityZ;

8
src/cr0s/WarpDrive/MovingEntity.java
View file

@ -11,13 +11,13 @@ import net.minecraft.entity.Entity;
* @author user
*/
public class MovingEntity {
public int oldX;
public int oldY;
public int oldZ;
public double oldX;
public double oldY;
public double oldZ;
public Entity entity;
public MovingEntity(Entity e, int x, int y, int z) {
public MovingEntity(Entity e, double x, double y, double z) {
this.entity = e;
this.oldX = x;