mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-08 16:41:47 +01:00
Various fixes; boats, minecarts, musicblocks
This commit is contained in:
parent
5cb6edd5a9
commit
80707c0a23
@ -28,7 +28,7 @@ public class BlockStationary extends BlockFluids {
|
|||||||
world.i = true;
|
world.i = true;
|
||||||
world.a(k, l, i1, bi - 1, j1);
|
world.a(k, l, i1, bi - 1, j1);
|
||||||
world.b(k, l, i1, k, l, i1);
|
world.b(k, l, i1, k, l, i1);
|
||||||
world.h(k, l, i1, bi - 1);
|
world.i(k, l, i1, bi - 1);
|
||||||
world.i = false;
|
world.i = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ public class EntityBoat extends Entity implements CraftMappable { // CraftBukkit
|
|||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
public double l() {
|
public double k() {
|
||||||
return (double) J * 0.0D - 0.30000001192092896D;
|
return (double) J * 0.0D - 0.30000001192092896D;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -317,7 +317,7 @@ public class EntityBoat extends Entity implements CraftMappable { // CraftBukkit
|
|||||||
double d1 = Math.cos(((double) v * 3.1415926535897931D) / 180D) * 0.40000000000000002D;
|
double d1 = Math.cos(((double) v * 3.1415926535897931D) / 180D) * 0.40000000000000002D;
|
||||||
double d2 = Math.sin(((double) v * 3.1415926535897931D) / 180D) * 0.40000000000000002D;
|
double d2 = Math.sin(((double) v * 3.1415926535897931D) / 180D) * 0.40000000000000002D;
|
||||||
|
|
||||||
j.a(p + d1, q + l() + j.F(), r + d2);
|
j.a(p + d1, q + k() + j.F(), r + d2);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -167,7 +167,7 @@ public class EntityMinecart extends Entity implements IInventory, CraftMappable
|
|||||||
}
|
}
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
|
|
||||||
public double l() {
|
public double k() {
|
||||||
return (double) J * 0.0D - 0.30000001192092896D;
|
return (double) J * 0.0D - 0.30000001192092896D;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,6 +54,10 @@ public class ItemBlock extends Item {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (itemstack.a == 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// CraftBukkit start - store the old data so we can undo it
|
// CraftBukkit start - store the old data so we can undo it
|
||||||
int oldMaterial = world.a(i, j, k);
|
int oldMaterial = world.a(i, j, k);
|
||||||
int oldData = world.b(i, j, k);
|
int oldData = world.b(i, j, k);
|
||||||
|
@ -102,6 +102,11 @@ public class WorldServer extends World {
|
|||||||
return explosion;
|
return explosion;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void c(int i, int j, int k, int l, int i1) {
|
||||||
|
super.c(i, j, k, l, i1);
|
||||||
|
D.f.a(i, j, k, 64D, ((Packet) (new Packet54(i, j, k, l, i1))));
|
||||||
|
}
|
||||||
|
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
private final CraftWorld world;
|
private final CraftWorld world;
|
||||||
private final CraftServer server;
|
private final CraftServer server;
|
||||||
|
Loading…
Reference in New Issue
Block a user