summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityItem.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityItem.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityItem.java250
1 files changed, 130 insertions, 120 deletions
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index dfcd4517..47f33ee2 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -1,7 +1,5 @@
package net.minecraft.server;
-import java.util.Random;
-
// CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftItem;
@@ -11,34 +9,31 @@ public class EntityItem extends Entity {
public ItemStack a;
private int e;
- public int b;
+ public int b = 0;
public int c;
- private int f;
- public float d;
+ private int f = 5;
+ public float d = (float) (Math.random() * 3.141592653589793D * 2.0D);
- public EntityItem(World world, double d1, double d2, double d3, ItemStack itemstack) {
- // CraftBukkit start
- this(world);
- // CraftBukkit end
- a(d1, d2, d3);
- a = itemstack;
- v = (float) (Math.random() * 360D);
- s = (float) (Math.random() * 0.20000000298023224D - 0.10000000149011612D);
- t = 0.20000000298023224D;
- u = (float) (Math.random() * 0.20000000298023224D - 0.10000000149011612D);
- M = false;
-
+ public EntityItem(World world, double d0, double d1, double d2, ItemStack itemstack) {
+ super(world);
+ this.a(0.25F, 0.25F);
+ this.height = this.width / 2.0F;
+ this.a(d0, d1, d2);
+ this.a = itemstack;
+ this.yaw = (float) (Math.random() * 360.0D);
+ this.motX = (double) ((float) (Math.random() * 0.20000000298023224D - 0.10000000149011612D));
+ this.motY = 0.20000000298023224D;
+ this.motZ = (double) ((float) (Math.random() * 0.20000000298023224D - 0.10000000149011612D));
+ this.M = false;
}
public EntityItem(World world) {
super(world);
- b = 0;
- f = 5;
- d = (float) (Math.random() * 3.1415926535897931D * 2D);
- a(0.25F, 0.25F);
- H = J / 2.0F;
+ this.a(0.25F, 0.25F);
+ this.height = this.width / 2.0F;
+
// CraftBukkit start
- CraftServer server = ((WorldServer) this.l).getServer();
+ CraftServer server = ((WorldServer) this.world).getServer();
this.bukkitEntity = new CraftItem(server, this);
// CraftBukkit end
}
@@ -47,152 +42,167 @@ public class EntityItem extends Entity {
public void b_() {
super.b_();
- if (c > 0) {
- c--;
+ if (this.c > 0) {
+ --this.c;
}
- m = p;
- n = q;
- o = r;
- t -= 0.039999999105930328D;
- if (l.c(MathHelper.b(p), MathHelper.b(q), MathHelper.b(r)) == Material.g) {
- t = 0.20000000298023224D;
- s = (W.nextFloat() - W.nextFloat()) * 0.2F;
- u = (W.nextFloat() - W.nextFloat()) * 0.2F;
- l.a(((Entity) (this)), "random.fizz", 0.4F, 2.0F + W.nextFloat() * 0.4F);
+
+ this.lastX = this.locX;
+ this.lastY = this.locY;
+ this.lastZ = this.locZ;
+ this.motY -= 0.03999999910593033D;
+ if (this.world.getMaterial(MathHelper.b(this.locX), MathHelper.b(this.locY), MathHelper.b(this.locZ)) == Material.LAVA) {
+ this.motY = 0.20000000298023224D;
+ this.motX = (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F);
+ this.motZ = (double) ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F);
+ this.world.a(this, "random.fizz", 0.4F, 2.0F + this.random.nextFloat() * 0.4F);
}
- g(p, q, r);
- c(s, t, u);
- float f1 = 0.98F;
- if (A) {
- f1 = 0.5880001F;
- int i = l.a(MathHelper.b(p), MathHelper.b(z.b) - 1, MathHelper.b(r));
+ this.g(this.locX, this.locY, this.locZ);
+ this.c(this.motX, this.motY, this.motZ);
+ float f = 0.98F;
+
+ if (this.onGround) {
+ f = 0.58800006F;
+ int i = this.world.getTypeId(MathHelper.b(this.locX), MathHelper.b(this.boundingBox.b) - 1, MathHelper.b(this.locZ));
if (i > 0) {
- f1 = Block.m[i].bu * 0.98F;
+ f = Block.byId[i].frictionFactor * 0.98F;
}
}
- s *= f1;
- t *= 0.98000001907348633D;
- u *= f1;
- if (A) {
- t *= -0.5D;
+
+ this.motX *= (double) f;
+ this.motY *= 0.9800000190734863D;
+ this.motZ *= (double) f;
+ if (this.onGround) {
+ this.motY *= -0.5D;
}
- e++;
- b++;
- if (b >= 6000) {
- q();
+
+ ++this.e;
+ ++this.b;
+ if (this.b >= 6000) {
+ this.q();
}
}
public boolean v() {
- return l.a(z, Material.f, ((Entity) (this)));
+ return this.world.a(this.boundingBox, Material.WATER, this);
}
- private boolean g(double d1, double d2, double d3) {
- int i = MathHelper.b(d1);
- int j = MathHelper.b(d2);
- int k = MathHelper.b(d3);
- double d4 = d1 - (double) i;
- double d5 = d2 - (double) j;
- double d6 = d3 - (double) k;
-
- if (Block.o[l.a(i, j, k)]) {
- boolean flag = !Block.o[l.a(i - 1, j, k)];
- boolean flag1 = !Block.o[l.a(i + 1, j, k)];
- boolean flag2 = !Block.o[l.a(i, j - 1, k)];
- boolean flag3 = !Block.o[l.a(i, j + 1, k)];
- boolean flag4 = !Block.o[l.a(i, j, k - 1)];
- boolean flag5 = !Block.o[l.a(i, j, k + 1)];
- byte byte0 = -1;
- double d7 = 9999D;
-
- if (flag && d4 < d7) {
- d7 = d4;
- byte0 = 0;
+ private boolean g(double d0, double d1, double d2) {
+ int i = MathHelper.b(d0);
+ int j = MathHelper.b(d1);
+ int k = MathHelper.b(d2);
+ double d3 = d0 - (double) i;
+ double d4 = d1 - (double) j;
+ double d5 = d2 - (double) k;
+
+ if (Block.o[this.world.getTypeId(i, j, k)]) {
+ boolean flag = !Block.o[this.world.getTypeId(i - 1, j, k)];
+ boolean flag1 = !Block.o[this.world.getTypeId(i + 1, j, k)];
+ boolean flag2 = !Block.o[this.world.getTypeId(i, j - 1, k)];
+ boolean flag3 = !Block.o[this.world.getTypeId(i, j + 1, k)];
+ boolean flag4 = !Block.o[this.world.getTypeId(i, j, k - 1)];
+ boolean flag5 = !Block.o[this.world.getTypeId(i, j, k + 1)];
+ byte b0 = -1;
+ double d6 = 9999.0D;
+
+ if (flag && d3 < d6) {
+ d6 = d3;
+ b0 = 0;
}
- if (flag1 && 1.0D - d4 < d7) {
- d7 = 1.0D - d4;
- byte0 = 1;
+
+ if (flag1 && 1.0D - d3 < d6) {
+ d6 = 1.0D - d3;
+ b0 = 1;
}
- if (flag2 && d5 < d7) {
- d7 = d5;
- byte0 = 2;
+
+ if (flag2 && d4 < d6) {
+ d6 = d4;
+ b0 = 2;
}
- if (flag3 && 1.0D - d5 < d7) {
- d7 = 1.0D - d5;
- byte0 = 3;
+
+ if (flag3 && 1.0D - d4 < d6) {
+ d6 = 1.0D - d4;
+ b0 = 3;
}
- if (flag4 && d6 < d7) {
- d7 = d6;
- byte0 = 4;
+
+ if (flag4 && d5 < d6) {
+ d6 = d5;
+ b0 = 4;
}
- if (flag5 && 1.0D - d6 < d7) {
- double d8 = 1.0D - d6;
- byte0 = 5;
+ if (flag5 && 1.0D - d5 < d6) {
+ d6 = 1.0D - d5;
+ b0 = 5;
}
- float f1 = W.nextFloat() * 0.2F + 0.1F;
- if (byte0 == 0) {
- s = -f1;
+ float f = this.random.nextFloat() * 0.2F + 0.1F;
+
+ if (b0 == 0) {
+ this.motX = (double) (-f);
}
- if (byte0 == 1) {
- s = f1;
+
+ if (b0 == 1) {
+ this.motX = (double) f;
}
- if (byte0 == 2) {
- t = -f1;
+
+ if (b0 == 2) {
+ this.motY = (double) (-f);
}
- if (byte0 == 3) {
- t = f1;
+
+ if (b0 == 3) {
+ this.motY = (double) f;
}
- if (byte0 == 4) {
- u = -f1;
+
+ if (b0 == 4) {
+ this.motZ = (double) (-f);
}
- if (byte0 == 5) {
- u = f1;
+
+ if (b0 == 5) {
+ this.motZ = (double) f;
}
}
+
return false;
}
protected void b(int i) {
- a(((Entity) (null)), i);
+ this.a((Entity) null, i);
}
public boolean a(Entity entity, int i) {
- y();
- f -= i;
- if (f <= 0) {
- q();
+ this.y();
+ this.f -= i;
+ if (this.f <= 0) {
+ this.q();
}
+
return false;
}
public void a(NBTTagCompound nbttagcompound) {
- nbttagcompound.a("Health", (short) f);
- nbttagcompound.a("Age", (short) b);
- nbttagcompound.a("Item", a.a(new NBTTagCompound()));
+ nbttagcompound.a("Health", (short) ((byte) this.f));
+ nbttagcompound.a("Age", (short) this.b);
+ nbttagcompound.a("Item", this.a.a(new NBTTagCompound()));
}
public void b(NBTTagCompound nbttagcompound) {
- f = nbttagcompound.c("Health") & 0xff;
- b = ((int) (nbttagcompound.c("Age")));
+ this.f = nbttagcompound.c("Health") & 255;
+ this.b = nbttagcompound.c("Age");
NBTTagCompound nbttagcompound1 = nbttagcompound.j("Item");
- a = new ItemStack(nbttagcompound1);
+ this.a = new ItemStack(nbttagcompound1);
}
- public void b(EntityPlayer entityplayer) {
- if (l.z) {
- return;
- }
- int i = a.a;
+ public void b(EntityHuman entityhuman) {
+ if (!this.world.isStatic) {
+ int i = this.a.count;
- if (c == 0 && entityplayer.an.a(a)) {
- l.a(((Entity) (this)), "random.pop", 0.2F, ((W.nextFloat() - W.nextFloat()) * 0.7F + 1.0F) * 2.0F);
- entityplayer.c(((Entity) (this)), i);
- q();
+ if (this.c == 0 && entityhuman.inventory.a(this.a)) {
+ this.world.a(this, "random.pop", 0.2F, ((this.random.nextFloat() - this.random.nextFloat()) * 0.7F + 1.0F) * 2.0F);
+ entityhuman.c(this, i);
+ this.q();
+ }
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 13:15:25 +0000