twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-17 05:03:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.3 beta

Browse Source
This commit is contained in:
Dinnerbone
2011-02-23 02:37:56 +00:00
parent a124bfdab5
commit f759e0b60d
83 changed files with 3182 additions and 3292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/main/java/net/minecraft/server/TileEntityMobSpawner.java
View File

@@ -2,13 +2,13 @@ package net.minecraft.server;
public class TileEntityMobSpawner extends TileEntity {
public int e = -1;
public int a = -1;
public String h = "Pig"; // CraftBukkit private -> public
public double f;
public double g = 0.0D;
public double b;
public double c = 0.0D;
public TileEntityMobSpawner() {
this.e = 20;
this.a = 20;
}
public void a(String s) {
@@ -16,34 +16,34 @@ public class TileEntityMobSpawner extends TileEntity {
}
public boolean a() {
return this.a.a((double) this.b + 0.5D, (double) this.c + 0.5D, (double) this.d + 0.5D, 16.0D) != null;
return this.d.a((double) this.e + 0.5D, (double) this.f + 0.5D, (double) this.g + 0.5D, 16.0D) != null;
}
public void f() {
this.g = this.f;
public void i_() {
this.c = this.b;
if (this.a()) {
double d0 = (double) ((float) this.b + this.a.l.nextFloat());
double d1 = (double) ((float) this.c + this.a.l.nextFloat());
double d2 = (double) ((float) this.d + this.a.l.nextFloat());
double d0 = (double) ((float) this.e + this.d.k.nextFloat());
double d1 = (double) ((float) this.f + this.d.k.nextFloat());
double d2 = (double) ((float) this.g + this.d.k.nextFloat());
this.a.a("smoke", d0, d1, d2, 0.0D, 0.0D, 0.0D);
this.a.a("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D);
this.d.a("smoke", d0, d1, d2, 0.0D, 0.0D, 0.0D);
this.d.a("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D);
for (this.f += (double) (1000.0F / ((float) this.e + 200.0F)); this.f > 360.0D; this.g -= 360.0D) {
this.f -= 360.0D;
for (this.b += (double) (1000.0F / ((float) this.a + 200.0F)); this.b > 360.0D; this.c -= 360.0D) {
this.b -= 360.0D;
}
if (this.e == -1) {
this.b();
if (this.a == -1) {
this.c();
}
if (this.e > 0) {
--this.e;
if (this.a > 0) {
--this.a;
} else {
byte b0 = 4;
for (int i = 0; i < b0; ++i) {
EntityLiving entityliving = (EntityLiving) ((EntityLiving) EntityTypes.a(this.h, this.a));
EntityLiving entityliving = (EntityLiving) ((EntityLiving) EntityTypes.a(this.h, this.d));
if (entityliving == null) {
return;
@@ -51,59 +51,59 @@ public class TileEntityMobSpawner extends TileEntity {
// CraftBukkit start - The world we're spawning in accepts this creature
boolean isAnimal = entityliving instanceof EntityAnimal || entityliving instanceof EntityWaterAnimal;
if ((isAnimal && !this.a.L) || (!isAnimal && !this.a.K)) {
if ((isAnimal && !this.d.E) || (!isAnimal && !this.d.D)) {
return;
}
// CraftBukkit end
int j = this.a.a(entityliving.getClass(), AxisAlignedBB.b((double) this.b, (double) this.c, (double) this.d, (double) (this.b + 1), (double) (this.c + 1), (double) (this.d + 1)).b(8.0D, 4.0D, 8.0D)).size();
int j = this.d.a(entityliving.getClass(), AxisAlignedBB.b((double) this.e, (double) this.f, (double) this.g, (double) (this.e + 1), (double) (this.f + 1), (double) (this.g + 1)).b(8.0D, 4.0D, 8.0D)).size();
if (j >= 6) {
this.b();
this.c();
return;
}
if (entityliving != null) {
double d3 = (double) this.b + (this.a.l.nextDouble() - this.a.l.nextDouble()) * 4.0D;
double d4 = (double) (this.c + this.a.l.nextInt(3) - 1);
double d5 = (double) this.d + (this.a.l.nextDouble() - this.a.l.nextDouble()) * 4.0D;
double d3 = (double) this.e + (this.d.k.nextDouble() - this.d.k.nextDouble()) * 4.0D;
double d4 = (double) (this.f + this.d.k.nextInt(3) - 1);
double d5 = (double) this.g + (this.d.k.nextDouble() - this.d.k.nextDouble()) * 4.0D;
entityliving.c(d3, d4, d5, this.a.l.nextFloat() * 360.0F, 0.0F);
entityliving.c(d3, d4, d5, this.d.k.nextFloat() * 360.0F, 0.0F);
if (entityliving.b()) {
this.a.a((Entity) entityliving);
this.d.a((Entity) entityliving);
for (int k = 0; k < 20; ++k) {
d0 = (double) this.b + 0.5D + ((double) this.a.l.nextFloat() - 0.5D) * 2.0D;
d1 = (double) this.c + 0.5D + ((double) this.a.l.nextFloat() - 0.5D) * 2.0D;
d2 = (double) this.d + 0.5D + ((double) this.a.l.nextFloat() - 0.5D) * 2.0D;
this.a.a("smoke", d0, d1, d2, 0.0D, 0.0D, 0.0D);
this.a.a("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D);
d0 = (double) this.e + 0.5D + ((double) this.d.k.nextFloat() - 0.5D) * 2.0D;
d1 = (double) this.f + 0.5D + ((double) this.d.k.nextFloat() - 0.5D) * 2.0D;
d2 = (double) this.g + 0.5D + ((double) this.d.k.nextFloat() - 0.5D) * 2.0D;
this.d.a("smoke", d0, d1, d2, 0.0D, 0.0D, 0.0D);
this.d.a("flame", d0, d1, d2, 0.0D, 0.0D, 0.0D);
}
entityliving.R();
this.b();
entityliving.I();
this.c();
}
}
}
super.f();
super.i_();
}
}
}
private void b() {
this.e = 200 + this.a.l.nextInt(600);
private void c() {
this.a = 200 + this.d.k.nextInt(600);
}
public void a(NBTTagCompound nbttagcompound) {
super.a(nbttagcompound);
this.h = nbttagcompound.h("EntityId");
this.e = nbttagcompound.c("Delay");
this.h = nbttagcompound.i("EntityId");
this.a = nbttagcompound.d("Delay");
}
public void b(NBTTagCompound nbttagcompound) {
super.b(nbttagcompound);
nbttagcompound.a("EntityId", this.h);
nbttagcompound.a("Delay", (short) this.e);
nbttagcompound.a("Delay", (short) this.a);
}
}