twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-09-02 13:23:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.5

Browse Source
This commit is contained in:
Travis Watkins
2013-03-13 17:33:27 -05:00
parent ba6e4c38cf
commit 83d29e461c
246 changed files with 8499 additions and 6759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/net/minecraft/server/BlockMinecartDetector.java
View File

@@ -5,14 +5,14 @@ import java.util.Random;
import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
public class BlockMinecartDetector extends BlockMinecartTrack {
public class BlockMinecartDetector extends BlockMinecartTrackAbstract {
public BlockMinecartDetector(int i, int j) {
super(i, j, true);
public BlockMinecartDetector(int i) {
super(i, true);
this.b(true);
}
public int r_() {
public int a(World world) {
return 20;
}
@@ -30,7 +30,7 @@ public class BlockMinecartDetector extends BlockMinecartTrack {
}
}
public void b(World world, int i, int j, int k, Random random) {
public void a(World world, int i, int j, int k, Random random) {
if (!world.isStatic) {
int l = world.getData(i, j, k);
@@ -40,19 +40,19 @@ public class BlockMinecartDetector extends BlockMinecartTrack {
}
}
public boolean b(IBlockAccess iblockaccess, int i, int j, int k, int l) {
return (iblockaccess.getData(i, j, k) & 8) != 0;
public int b(IBlockAccess iblockaccess, int i, int j, int k, int l) {
return (iblockaccess.getData(i, j, k) & 8) != 0 ? 15 : 0;
}
public boolean c(IBlockAccess iblockaccess, int i, int j, int k, int l) {
return (iblockaccess.getData(i, j, k) & 8) == 0 ? false : l == 1;
public int c(IBlockAccess iblockaccess, int i, int j, int k, int l) {
return (iblockaccess.getData(i, j, k) & 8) == 0 ? 0 : (l == 1 ? 15 : 0);
}
private void d(World world, int i, int j, int k, int l) {
boolean flag = (l & 8) != 0;
boolean flag1 = false;
float f = 0.125F;
List list = world.a(EntityMinecart.class, AxisAlignedBB.a().a((double) ((float) i + f), (double) j, (double) ((float) k + f), (double) ((float) (i + 1) - f), (double) ((float) (j + 1) - f), (double) ((float) (k + 1) - f)));
List list = world.a(EntityMinecartAbstract.class, AxisAlignedBB.a().a((double) ((float) i + f), (double) j, (double) ((float) k + f), (double) ((float) (i + 1) - f), (double) ((float) (j + 1) - f), (double) ((float) (k + 1) - f)));
if (!list.isEmpty()) {
flag1 = true;
@@ -62,7 +62,7 @@ public class BlockMinecartDetector extends BlockMinecartTrack {
if (flag != flag1) {
org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k);
BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, flag ? 1 : 0, flag1 ? 1 : 0);
BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, flag ? 15 : 0, flag1 ? 15 : 0);
world.getServer().getPluginManager().callEvent(eventRedstone);
flag1 = eventRedstone.getNewCurrent() > 0;
@@ -70,21 +70,45 @@ public class BlockMinecartDetector extends BlockMinecartTrack {
// CraftBukkit end
if (flag1 && !flag) {
world.setData(i, j, k, l | 8);
world.setData(i, j, k, l | 8, 3);
world.applyPhysics(i, j, k, this.id);
world.applyPhysics(i, j - 1, k, this.id);
world.e(i, j, k, i, j, k);
world.g(i, j, k, i, j, k);
}
if (!flag1 && flag) {
world.setData(i, j, k, l & 7);
world.setData(i, j, k, l & 7, 3);
world.applyPhysics(i, j, k, this.id);
world.applyPhysics(i, j - 1, k, this.id);
world.e(i, j, k, i, j, k);
world.g(i, j, k, i, j, k);
}
if (flag1) {
world.a(i, j, k, this.id, this.r_());
world.a(i, j, k, this.id, this.a(world));
}
world.m(i, j, k, this.id);
}
public void onPlace(World world, int i, int j, int k) {
super.onPlace(world, i, j, k);
this.d(world, i, j, k, world.getData(i, j, k));
}
public boolean q_() {
return true;
}
public int b_(World world, int i, int j, int k, int l) {
if ((world.getData(i, j, k) & 8) > 0) {
float f = 0.125F;
List list = world.a(EntityMinecartAbstract.class, AxisAlignedBB.a().a((double) ((float) i + f), (double) j, (double) ((float) k + f), (double) ((float) (i + 1) - f), (double) ((float) (j + 1) - f), (double) ((float) (k + 1) - f)), IEntitySelector.b);
if (list.size() > 0) {
return Container.b((IInventory) list.get(0));
}
}
return 0;
}
}