Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.4(.2).

Browse Source
This commit is contained in:
Travis Watkins
2012-10-24 22:53:23 -05:00
committed by EvilSeph
parent b9a72531b6
commit 60819c6693
237 changed files with 10104 additions and 4863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

287
src/main/java/net/minecraft/server/BlockDispenser.java
View File

@@ -2,14 +2,11 @@ package net.minecraft.server;
import java.util.Random;
// CraftBukkit start
import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.event.block.BlockDispenseEvent;
// CraftBukkit end
public class BlockDispenser extends BlockContainer {
private Random a = new Random();
public static final IRegistry a = new RegistryDefault(new DispenseBehaviorItem());
private Random b = new Random();
public static boolean eventFired = false; // CraftBukkit
protected BlockDispenser(int i) {
super(i, Material.STONE);
@@ -17,7 +14,7 @@ public class BlockDispenser extends BlockContainer {
this.a(CreativeModeTab.d);
}
public int p_() {
public int r_() {
return 4;
}
@@ -38,19 +35,19 @@ public class BlockDispenser extends BlockContainer {
int k1 = world.getTypeId(i + 1, j, k);
byte b0 = 3;
if (Block.n[l] && !Block.n[i1]) {
if (Block.q[l] && !Block.q[i1]) {
b0 = 3;
}
if (Block.n[i1] && !Block.n[l]) {
if (Block.q[i1] && !Block.q[l]) {
b0 = 2;
}
if (Block.n[j1] && !Block.n[k1]) {
if (Block.q[j1] && !Block.q[k1]) {
b0 = 5;
}
if (Block.n[k1] && !Block.n[j1]) {
if (Block.q[k1] && !Block.q[j1]) {
b0 = 4;
}
@@ -76,104 +73,26 @@ public class BlockDispenser extends BlockContainer {
}
}
// CraftBukkit - private to public
public void dispense(World world, int i, int j, int k, Random random) {
int l = world.getData(i, j, k);
byte b0 = 0;
byte b1 = 0;
if (l == 3) {
b1 = 1;
} else if (l == 2) {
b1 = -1;
} else if (l == 5) {
b0 = 1;
} else {
b0 = -1;
}
TileEntityDispenser tileentitydispenser = (TileEntityDispenser) world.getTileEntity(i, j, k);
// CraftBukkit - private -> public
public void dispense(World world, int i, int j, int k) {
SourceBlock sourceblock = new SourceBlock(world, i, j, k);
TileEntityDispenser tileentitydispenser = (TileEntityDispenser) sourceblock.getTileEntity();
if (tileentitydispenser != null) {
int i1 = tileentitydispenser.i();
int l = tileentitydispenser.i();
if (i1 < 0) {
if (l < 0) {
world.triggerEffect(1001, i, j, k, 0);
} else {
double d0 = (double) i + (double) b0 * 0.6D + 0.5D;
double d1 = (double) j + 0.5D;
double d2 = (double) k + (double) b1 * 0.6D + 0.5D;
ItemStack itemstack = tileentitydispenser.getItem(i1);
ItemStack itemstack = tileentitydispenser.getItem(l);
IDispenseBehavior idispensebehavior = (IDispenseBehavior) a.a(itemstack.getItem());
// CraftBukkit start
// Clone item stack, then set the count to 1
itemstack = itemstack.cloneItemStack();
itemstack.count = 1;
if (idispensebehavior != IDispenseBehavior.a) {
ItemStack itemstack1 = idispensebehavior.a(sourceblock, itemstack);
eventFired = false; // CraftBukkit - reset event status
double d3 = random.nextDouble() * 0.1D + 0.2D;
double motX = (double) b0 * d3;
double motY = 0.20000000298023224D;
double motZ = (double) b1 * d3;
motX += random.nextGaussian() * 0.007499999832361937D * 6.0D;
motY += random.nextGaussian() * 0.007499999832361937D * 6.0D;
motZ += random.nextGaussian() * 0.007499999832361937D * 6.0D;
org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k);
org.bukkit.inventory.ItemStack bukkitItem = new CraftItemStack(itemstack).clone();
BlockDispenseEvent event = new BlockDispenseEvent(block, bukkitItem, new org.bukkit.util.Vector(motX, motY, motZ));
world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
tileentitydispenser.setItem(l, itemstack1.count == 0 ? null : itemstack1);
}
itemstack = CraftItemStack.createNMSItemStack(event.getItem());
// CraftBukkit end
int j1 = a(tileentitydispenser, world, itemstack, random, i, j, k, b0, b1, d0, d1, d2);
if (j1 == 1) {
// CraftBukkit start
if (event.getItem().equals(bukkitItem)) {
// Actually remove the item
tileentitydispenser.splitStack(i1, 1);
}
// CraftBukkit end
} else if (j1 == 0) {
// CraftBukkit start
motX = event.getVelocity().getX();
motY = event.getVelocity().getY();
motZ = event.getVelocity().getZ();
if (event.getItem().equals(bukkitItem)) {
// Actually remove the item
tileentitydispenser.splitStack(i1, 1);
}
EntityItem entityitem = new EntityItem(world, d0, d1 - 0.3D, d2, itemstack);
entityitem.motX = event.getVelocity().getX();
entityitem.motY = event.getVelocity().getY();
entityitem.motZ = event.getVelocity().getZ();
world.addEntity(entityitem);
// CraftBukkit end
world.triggerEffect(1000, i, j, k, 0);
// CraftBukkit start - new condition
} else if (j1 == 2) {
ItemStack old = tileentitydispenser.getItem(i1);
if (old.id == Item.BUCKET.id && old.count > 1) {
old.count--;
if (tileentitydispenser.a(itemstack) < 0) {
a(world, itemstack, random, 6, l, i1, d0, d1, d2);
}
} else {
tileentitydispenser.setItem(i1, itemstack);
}
// CraftBukkit end
}
world.triggerEffect(2000, i, j, k, b0 + 1 + (b1 + 1) * 3);
}
}
}
@@ -183,14 +102,14 @@ public class BlockDispenser extends BlockContainer {
boolean flag = world.isBlockIndirectlyPowered(i, j, k) || world.isBlockIndirectlyPowered(i, j + 1, k);
if (flag) {
world.a(i, j, k, this.id, this.p_());
world.a(i, j, k, this.id, this.r_());
}
}
}
public void b(World world, int i, int j, int k, Random random) {
if (!world.isStatic && (world.isBlockIndirectlyPowered(i, j, k) || world.isBlockIndirectlyPowered(i, j + 1, k))) {
this.dispense(world, i, j, k, random);
this.dispense(world, i, j, k);
}
}
@@ -226,12 +145,12 @@ public class BlockDispenser extends BlockContainer {
ItemStack itemstack = tileentitydispenser.getItem(j1);
if (itemstack != null) {
float f = this.a.nextFloat() * 0.8F + 0.1F;
float f1 = this.a.nextFloat() * 0.8F + 0.1F;
float f2 = this.a.nextFloat() * 0.8F + 0.1F;
float f = this.b.nextFloat() * 0.8F + 0.1F;
float f1 = this.b.nextFloat() * 0.8F + 0.1F;
float f2 = this.b.nextFloat() * 0.8F + 0.1F;
while (itemstack.count > 0) {
int k1 = this.a.nextInt(21) + 10;
int k1 = this.b.nextInt(21) + 10;
if (k1 > itemstack.count) {
k1 = itemstack.count;
@@ -246,9 +165,9 @@ public class BlockDispenser extends BlockContainer {
float f3 = 0.05F;
entityitem.motX = (double) ((float) this.a.nextGaussian() * f3);
entityitem.motY = (double) ((float) this.a.nextGaussian() * f3 + 0.2F);
entityitem.motZ = (double) ((float) this.a.nextGaussian() * f3);
entityitem.motX = (double) ((float) this.b.nextGaussian() * f3);
entityitem.motY = (double) ((float) this.b.nextGaussian() * f3 + 0.2F);
entityitem.motZ = (double) ((float) this.b.nextGaussian() * f3);
world.addEntity(entityitem);
}
}
@@ -258,148 +177,12 @@ public class BlockDispenser extends BlockContainer {
super.remove(world, i, j, k, l, i1);
}
private static void a(World world, ItemStack itemstack, Random random, int i, int j, int k, double d0, double d1, double d2) {
EntityItem entityitem = new EntityItem(world, d0, d1 - 0.3D, d2, itemstack);
double d3 = random.nextDouble() * 0.1D + 0.2D;
public static IPosition a(ISourceBlock isourceblock) {
EnumFacing enumfacing = EnumFacing.a(isourceblock.h());
double d0 = isourceblock.getX() + 0.6D * (double) enumfacing.c();
double d1 = isourceblock.getY();
double d2 = isourceblock.getZ() + 0.6D * (double) enumfacing.e();
entityitem.motX = (double) j * d3;
entityitem.motY = 0.20000000298023224D;
entityitem.motZ = (double) k * d3;
entityitem.motX += random.nextGaussian() * 0.007499999832361937D * (double) i;
entityitem.motY += random.nextGaussian() * 0.007499999832361937D * (double) i;
entityitem.motZ += random.nextGaussian() * 0.007499999832361937D * (double) i;
world.addEntity(entityitem);
}
private static int a(TileEntityDispenser tileentitydispenser, World world, ItemStack itemstack, Random random, int i, int j, int k, int l, int i1, double d0, double d1, double d2) {
float f = 1.1F;
byte b0 = 6;
if (itemstack.id == Item.ARROW.id) {
EntityArrow entityarrow = new EntityArrow(world, d0, d1, d2);
entityarrow.shoot((double) l, 0.10000000149011612D, (double) i1, f, (float) b0);
entityarrow.fromPlayer = 1;
world.addEntity(entityarrow);
world.triggerEffect(1002, i, j, k, 0);
return 1;
} else if (itemstack.id == Item.EGG.id) {
EntityEgg entityegg = new EntityEgg(world, d0, d1, d2);
entityegg.c((double) l, 0.10000000149011612D, (double) i1, f, (float) b0);
world.addEntity(entityegg);
world.triggerEffect(1002, i, j, k, 0);
return 1;
} else if (itemstack.id == Item.SNOW_BALL.id) {
EntitySnowball entitysnowball = new EntitySnowball(world, d0, d1, d2);
entitysnowball.c((double) l, 0.10000000149011612D, (double) i1, f, (float) b0);
world.addEntity(entitysnowball);
world.triggerEffect(1002, i, j, k, 0);
return 1;
} else if (itemstack.id == Item.POTION.id && ItemPotion.g(itemstack.getData())) {
EntityPotion entitypotion = new EntityPotion(world, d0, d1, d2, itemstack.getData());
entitypotion.c((double) l, 0.10000000149011612D, (double) i1, f * 1.25F, (float) b0 * 0.5F);
world.addEntity(entitypotion);
world.triggerEffect(1002, i, j, k, 0);
return 1;
} else if (itemstack.id == Item.EXP_BOTTLE.id) {
EntityThrownExpBottle entitythrownexpbottle = new EntityThrownExpBottle(world, d0, d1, d2);
entitythrownexpbottle.c((double) l, 0.10000000149011612D, (double) i1, f * 1.25F, (float) b0 * 0.5F);
world.addEntity(entitythrownexpbottle);
world.triggerEffect(1002, i, j, k, 0);
return 1;
} else if (itemstack.id == Item.MONSTER_EGG.id) {
ItemMonsterEgg.a(world, itemstack.getData(), d0 + (double) l * 0.3D, d1 - 0.3D, d2 + (double) i1 * 0.3D);
world.triggerEffect(1002, i, j, k, 0);
return 1;
} else if (itemstack.id == Item.FIREBALL.id) {
EntitySmallFireball entitysmallfireball = new EntitySmallFireball(world, d0 + (double) l * 0.3D, d1, d2 + (double) i1 * 0.3D, (double) l + random.nextGaussian() * 0.05D, random.nextGaussian() * 0.05D, (double) i1 + random.nextGaussian() * 0.05D);
world.addEntity(entitysmallfireball);
world.triggerEffect(1009, i, j, k, 0);
return 1;
} else if (itemstack.id != Item.LAVA_BUCKET.id && itemstack.id != Item.WATER_BUCKET.id) {
if (itemstack.id == Item.BUCKET.id) {
int j1 = i + l;
int k1 = k + i1;
Material material = world.getMaterial(j1, j, k1);
int l1 = world.getData(j1, j, k1);
if (material == Material.WATER && l1 == 0) {
world.setTypeId(j1, j, k1, 0);
if (--itemstack.count == 0) {
itemstack.id = Item.WATER_BUCKET.id;
itemstack.count = 1;
} else if (tileentitydispenser.a(new ItemStack(Item.WATER_BUCKET)) < 0) {
a(world, new ItemStack(Item.WATER_BUCKET), random, 6, l, i1, d0, d1, d2);
}
return 2;
} else if (material == Material.LAVA && l1 == 0) {
world.setTypeId(j1, j, k1, 0);
if (--itemstack.count == 0) {
itemstack.id = Item.LAVA_BUCKET.id;
itemstack.count = 1;
} else if (tileentitydispenser.a(new ItemStack(Item.LAVA_BUCKET)) < 0) {
a(world, new ItemStack(Item.LAVA_BUCKET), random, 6, l, i1, d0, d1, d2);
}
return 2;
} else {
return 0;
}
} else if (itemstack.getItem() instanceof ItemMinecart) {
d0 = (double) i + (l < 0 ? (double) l * 0.8D : (double) ((float) l * 1.8F)) + (double) ((float) Math.abs(i1) * 0.5F);
d2 = (double) k + (i1 < 0 ? (double) i1 * 0.8D : (double) ((float) i1 * 1.8F)) + (double) ((float) Math.abs(l) * 0.5F);
if (BlockMinecartTrack.d_(world, i + l, j, k + i1)) {
d1 = (double) ((float) j + 0.5F);
} else {
if (!world.isEmpty(i + l, j, k + i1) || !BlockMinecartTrack.d_(world, i + l, j - 1, k + i1)) {
return 0;
}
d1 = (double) ((float) j - 0.5F);
}
EntityMinecart entityminecart = new EntityMinecart(world, d0, d1, d2, ((ItemMinecart) itemstack.getItem()).a);
world.addEntity(entityminecart);
world.triggerEffect(1000, i, j, k, 0);
return 1;
} else if (itemstack.id == Item.BOAT.id) {
d0 = (double) i + (l < 0 ? (double) l * 0.8D : (double) ((float) l * 1.8F)) + (double) ((float) Math.abs(i1) * 0.5F);
d2 = (double) k + (i1 < 0 ? (double) i1 * 0.8D : (double) ((float) i1 * 1.8F)) + (double) ((float) Math.abs(l) * 0.5F);
if (world.getMaterial(i + l, j, k + i1) == Material.WATER) {
d1 = (double) ((float) j + 1.0F);
} else {
if (!world.isEmpty(i + l, j, k + i1) || world.getMaterial(i + l, j - 1, k + i1) != Material.WATER) {
return 0;
}
d1 = (double) j;
}
EntityBoat entityboat = new EntityBoat(world, d0, d1, d2);
world.addEntity(entityboat);
world.triggerEffect(1000, i, j, k, 0);
return 1;
} else {
return 0;
}
} else {
ItemBucket itembucket = (ItemBucket) itemstack.getItem();
if (itembucket.a(world, (double) i, (double) j, (double) k, i + l, j, k + i1)) {
itemstack.id = Item.BUCKET.id;
itemstack.count = 1;
return 2;
} else {
return 0;
}
}
return new Position(d0, d1, d2);
}
}