Implemented boat, fixed some event issues with minecarts, and implemented the events for boats that were implemented for minecarts.
Dieser Commit ist enthalten in:
Ursprung
592f510228
Commit
22c2fdeaf0
362
src/main/java/net/minecraft/server/EntityBoat.java
Normale Datei
362
src/main/java/net/minecraft/server/EntityBoat.java
Normale Datei
@ -0,0 +1,362 @@
|
||||
package net.minecraft.server;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.craftbukkit.CraftBoat;
|
||||
import org.bukkit.craftbukkit.CraftMinecart;
|
||||
import org.bukkit.craftbukkit.CraftServer;
|
||||
import org.bukkit.event.Event.Type;
|
||||
import org.bukkit.event.vehicle.VehicleCreateEvent;
|
||||
import org.bukkit.event.vehicle.VehicleDamageEvent;
|
||||
import org.bukkit.event.vehicle.VehicleEnterEvent;
|
||||
import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
|
||||
import org.bukkit.event.vehicle.VehicleMoveEvent;
|
||||
|
||||
public class EntityBoat extends Entity {
|
||||
|
||||
public CraftBoat boat;
|
||||
|
||||
public int a;
|
||||
public int b;
|
||||
public int c;
|
||||
private int d;
|
||||
private double e;
|
||||
private double f;
|
||||
private double aj;
|
||||
private double ak;
|
||||
private double al;
|
||||
|
||||
public EntityBoat(World world) {
|
||||
super(world);
|
||||
a = 0;
|
||||
b = 0;
|
||||
c = 1;
|
||||
i = true;
|
||||
a(1.5F, 0.6F);
|
||||
H = J / 2.0F;
|
||||
M = false;
|
||||
|
||||
// CraftBukkit start
|
||||
handleCreation(world);
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
public AxisAlignedBB d(Entity entity) {
|
||||
return entity.z;
|
||||
}
|
||||
|
||||
public AxisAlignedBB q() {
|
||||
return z;
|
||||
}
|
||||
|
||||
public boolean v() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public EntityBoat(World world, double d1, double d2, double d3) {
|
||||
this(world);
|
||||
a(d1, d2 + (double) H, d3);
|
||||
s = 0.0D;
|
||||
t = 0.0D;
|
||||
u = 0.0D;
|
||||
m = d1;
|
||||
n = d2;
|
||||
o = d3;
|
||||
|
||||
// CraftBukkit start
|
||||
handleCreation(world);
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
// CraftBukkit start
|
||||
private void handleCreation(World world) {
|
||||
CraftServer server = ((WorldServer) world).getServer();
|
||||
boat = new CraftBoat(server, this);
|
||||
VehicleCreateEvent event = new VehicleCreateEvent(
|
||||
Type.VEHICLE_CREATE, boat);
|
||||
server.getPluginManager().callEvent(event);
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
public double j() {
|
||||
return (double) J * 0.0D - 0.30000001192092896D;
|
||||
}
|
||||
|
||||
public boolean a(Entity entity, int i) {
|
||||
// CraftBukkit start
|
||||
VehicleDamageEvent event = new VehicleDamageEvent(
|
||||
Type.VEHICLE_DAMAGE, boat,
|
||||
((WorldServer)l).getWorld().toCraftEntity(entity), i);
|
||||
((WorldServer)l).getServer().getPluginManager().callEvent(event);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
return true;
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
if (this.l.z || G) {
|
||||
return true;
|
||||
}
|
||||
c = -c;
|
||||
b = 10;
|
||||
a += i * 10;
|
||||
u();
|
||||
if (a > 40) {
|
||||
for (int k = 0; k < 3; k++) {
|
||||
a(Block.x.bh, 1, 0.0F);
|
||||
}
|
||||
|
||||
for (int l = 0; l < 2; l++) {
|
||||
a(Item.B.aW, 1, 0.0F);
|
||||
}
|
||||
|
||||
l();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean c_() {
|
||||
return !G;
|
||||
}
|
||||
|
||||
public void b_() {
|
||||
double prevX = p;
|
||||
double prevY = q;
|
||||
double prevZ = r;
|
||||
float prevYaw = v;
|
||||
float prevPitch = w;
|
||||
|
||||
super.b_();
|
||||
if (b > 0) {
|
||||
b--;
|
||||
}
|
||||
if (a > 0) {
|
||||
a--;
|
||||
}
|
||||
m = p;
|
||||
n = q;
|
||||
o = r;
|
||||
int i = 5;
|
||||
double d1 = 0.0D;
|
||||
|
||||
for (int k = 0; k < i; k++) {
|
||||
double d2 = (z.b + ((z.e - z.b) * (double) (k + 0)) / (double) i) - 0.125D;
|
||||
double d3 = (z.b + ((z.e - z.b) * (double) (k + 1)) / (double) i) - 0.125D;
|
||||
AxisAlignedBB axisalignedbb = AxisAlignedBB.b(z.a, d2, z.c, z.d, d3, z.f);
|
||||
|
||||
if (this.l.b(axisalignedbb, Material.f)) {
|
||||
d1 += 1.0D / (double) i;
|
||||
}
|
||||
}
|
||||
|
||||
if (this.l.z) {
|
||||
if (d > 0) {
|
||||
double d4 = p + (e - p) / (double) d;
|
||||
double d7 = q + (f - q) / (double) d;
|
||||
double d10 = r + (aj - r) / (double) d;
|
||||
double d13;
|
||||
|
||||
for (d13 = ak - (double) v; d13 < -180D; d13 += 360D) {
|
||||
;
|
||||
}
|
||||
for (; d13 >= 180D; d13 -= 360D) {
|
||||
;
|
||||
}
|
||||
v += d13 / (double) d;
|
||||
w += (al - (double) w) / (double) d;
|
||||
d--;
|
||||
a(d4, d7, d10);
|
||||
b(v, w);
|
||||
} else {
|
||||
double d5 = p + s;
|
||||
double d8 = q + t;
|
||||
double d11 = r + u;
|
||||
|
||||
a(d5, d8, d11);
|
||||
if (A) {
|
||||
s *= 0.5D;
|
||||
t *= 0.5D;
|
||||
u *= 0.5D;
|
||||
}
|
||||
s *= 0.99000000953674316D;
|
||||
t *= 0.94999998807907104D;
|
||||
u *= 0.99000000953674316D;
|
||||
}
|
||||
return;
|
||||
}
|
||||
double d6 = d1 * 2D - 1.0D;
|
||||
|
||||
t += 0.039999999105930328D * d6;
|
||||
if (j != null) {
|
||||
s += j.s * 0.20000000000000001D;
|
||||
u += j.u * 0.20000000000000001D;
|
||||
}
|
||||
double d9 = 0.40000000000000002D;
|
||||
|
||||
if (s < -d9) {
|
||||
s = -d9;
|
||||
}
|
||||
if (s > d9) {
|
||||
s = d9;
|
||||
}
|
||||
if (u < -d9) {
|
||||
u = -d9;
|
||||
}
|
||||
if (u > d9) {
|
||||
u = d9;
|
||||
}
|
||||
if (A) {
|
||||
s *= 0.5D;
|
||||
t *= 0.5D;
|
||||
u *= 0.5D;
|
||||
}
|
||||
c(s, t, u);
|
||||
double d12 = Math.sqrt(s * s + u * u);
|
||||
|
||||
if (d12 > 0.14999999999999999D) {
|
||||
double d14 = Math.cos(((double) v * 3.1415926535897931D) / 180D);
|
||||
double d16 = Math.sin(((double) v * 3.1415926535897931D) / 180D);
|
||||
|
||||
for (int l = 0; (double) l < 1.0D + d12 * 60D; l++) {
|
||||
double d18 = W.nextFloat() * 2.0F - 1.0F;
|
||||
double d19 = (double) (W.nextInt(2) * 2 - 1) * 0.69999999999999996D;
|
||||
|
||||
if (W.nextBoolean()) {
|
||||
double d20 = (p - d14 * d18 * 0.80000000000000004D) + d16 * d19;
|
||||
double d22 = r - d16 * d18 * 0.80000000000000004D - d14 * d19;
|
||||
|
||||
this.l.a("splash", d20, q - 0.125D, d22, s, t, u);
|
||||
} else {
|
||||
double d21 = p + d14 + d16 * d18 * 0.69999999999999996D;
|
||||
double d23 = (r + d16) - d14 * d18 * 0.69999999999999996D;
|
||||
|
||||
this.l.a("splash", d21, q - 0.125D, d23, s, t, u);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (B && d12 > 0.14999999999999999D) {
|
||||
if (!this.l.z) {
|
||||
l();
|
||||
for (int i1 = 0; i1 < 3; i1++) {
|
||||
a(Block.x.bh, 1, 0.0F);
|
||||
}
|
||||
|
||||
for (int j1 = 0; j1 < 2; j1++) {
|
||||
a(Item.B.aW, 1, 0.0F);
|
||||
}
|
||||
|
||||
}
|
||||
} else {
|
||||
s *= 0.99000000953674316D;
|
||||
t *= 0.94999998807907104D;
|
||||
u *= 0.99000000953674316D;
|
||||
}
|
||||
w = 0.0F;
|
||||
double d15 = v;
|
||||
double d17 = m - p;
|
||||
double d24 = o - r;
|
||||
|
||||
if (d17 * d17 + d24 * d24 > 0.001D) {
|
||||
d15 = (float) ((Math.atan2(d24, d17) * 180D) / 3.1415926535897931D);
|
||||
}
|
||||
double d25;
|
||||
|
||||
for (d25 = d15 - (double) v; d25 >= 180D; d25 -= 360D) {
|
||||
;
|
||||
}
|
||||
for (; d25 < -180D; d25 += 360D) {
|
||||
;
|
||||
}
|
||||
if (d25 > 20D) {
|
||||
d25 = 20D;
|
||||
}
|
||||
if (d25 < -20D) {
|
||||
d25 = -20D;
|
||||
}
|
||||
v += d25;
|
||||
b(v, w);
|
||||
|
||||
// CraftBukkit start
|
||||
CraftServer server = ((WorldServer)l).getServer();
|
||||
VehicleMoveEvent event = new VehicleMoveEvent(
|
||||
Type.VEHICLE_MOVE, boat,
|
||||
new Location(((WorldServer)l).getWorld(), prevX, prevY, prevZ, prevYaw, prevPitch),
|
||||
new Location(((WorldServer)l).getWorld(), p, q, r, v, w));
|
||||
server.getPluginManager().callEvent(event);
|
||||
// CraftBukkit end
|
||||
|
||||
List list = this.l.b(this, z.b(0.20000000298023224D, 0.0D, 0.20000000298023224D));
|
||||
|
||||
if (list != null && list.size() > 0) {
|
||||
for (int k1 = 0; k1 < list.size(); k1++) {
|
||||
Entity entity = (Entity) list.get(k1);
|
||||
|
||||
if (entity != j && entity.v() && (entity instanceof EntityBoat)) {
|
||||
entity.c(this);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (j != null && j.G) {
|
||||
j = null;
|
||||
}
|
||||
}
|
||||
|
||||
public void A() {
|
||||
if (j == null) {
|
||||
return;
|
||||
} else {
|
||||
double d1 = Math.cos(((double) v * 3.1415926535897931D) / 180D) * 0.40000000000000002D;
|
||||
double d2 = Math.sin(((double) v * 3.1415926535897931D) / 180D) * 0.40000000000000002D;
|
||||
|
||||
j.a(p + d1, q + j() + j.B(), r + d2);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
public void c(Entity entity) {
|
||||
// CraftBukkit start
|
||||
CraftServer server = ((WorldServer)l).getServer();
|
||||
VehicleEntityCollisionEvent collsionEvent = new VehicleEntityCollisionEvent(
|
||||
Type.VEHICLE_COLLISION_ENTITY, boat,
|
||||
((WorldServer)l).getWorld().toCraftEntity(entity));
|
||||
server.getPluginManager().callEvent(collsionEvent);
|
||||
|
||||
if (collsionEvent.isCancelled()) {
|
||||
return;
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
super.c(entity);
|
||||
}
|
||||
|
||||
protected void a(NBTTagCompound nbttagcompound) {}
|
||||
|
||||
protected void b(NBTTagCompound nbttagcompound) {}
|
||||
|
||||
public boolean a(EntityPlayer entityplayer) {
|
||||
if (j != null && (j instanceof EntityPlayer) && j != entityplayer) {
|
||||
return true;
|
||||
}
|
||||
if (!l.z) {
|
||||
// CraftBukkit start
|
||||
CraftServer server = ((WorldServer)l).getServer();
|
||||
VehicleEnterEvent event = new VehicleEnterEvent(
|
||||
Type.VEHICLE_ENTER,
|
||||
boat,
|
||||
((WorldServer)l).getWorld().toCraftEntity(entityplayer));
|
||||
server.getPluginManager().callEvent(event);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
return true;
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
entityplayer.e(this);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -114,7 +114,7 @@ public class EntityMinecart extends Entity
|
||||
M = false;
|
||||
|
||||
// CraftBukkit start
|
||||
handleMinecartCreation(world);
|
||||
handleCreation(world);
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
@ -149,12 +149,12 @@ public class EntityMinecart extends Entity
|
||||
d = i;
|
||||
|
||||
// CraftBukkit start
|
||||
handleMinecartCreation(world);
|
||||
handleCreation(world);
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
// CraftBukkit start
|
||||
private void handleMinecartCreation(World world) {
|
||||
private void handleCreation(World world) {
|
||||
CraftServer server = ((WorldServer) world).getServer();
|
||||
minecart = CraftMinecart.getCraftMinecart(server, this);
|
||||
VehicleCreateEvent event = new VehicleCreateEvent(
|
||||
@ -463,17 +463,7 @@ public class EntityMinecart extends Entity
|
||||
t *= flyingY;
|
||||
u *= flyingZ;
|
||||
}
|
||||
}
|
||||
|
||||
// CraftBukkit start
|
||||
CraftServer server = ((WorldServer)l).getServer();
|
||||
VehicleMoveEvent event = new VehicleMoveEvent(
|
||||
Type.VEHICLE_MOVE,
|
||||
minecart,
|
||||
new Location(((WorldServer)l).getWorld(), prevX, prevY, prevZ, prevYaw, prevPitch),
|
||||
new Location(((WorldServer)l).getWorld(), p, q, r, v, w));
|
||||
server.getPluginManager().callEvent(event);
|
||||
// CraftBukkit end
|
||||
}
|
||||
|
||||
w = 0.0F;
|
||||
double d28 = m - p;
|
||||
@ -498,6 +488,16 @@ public class EntityMinecart extends Entity
|
||||
al = !al;
|
||||
}
|
||||
b(v, w);
|
||||
|
||||
// CraftBukkit start
|
||||
CraftServer server = ((WorldServer)l).getServer();
|
||||
VehicleMoveEvent event = new VehicleMoveEvent(
|
||||
Type.VEHICLE_MOVE, minecart,
|
||||
new Location(((WorldServer)l).getWorld(), prevX, prevY, prevZ, prevYaw, prevPitch),
|
||||
new Location(((WorldServer)l).getWorld(), p, q, r, v, w));
|
||||
server.getPluginManager().callEvent(event);
|
||||
// CraftBukkit end
|
||||
|
||||
List list = l.b(this, z.b(0.20000000298023224D, 0.0D, 0.20000000298023224D));
|
||||
|
||||
if (list != null && list.size() > 0) {
|
||||
@ -754,25 +754,25 @@ public class EntityMinecart extends Entity
|
||||
|
||||
public void d() {}
|
||||
|
||||
public boolean a(EntityPlayer entityplayer) {
|
||||
// CraftBukkit start
|
||||
CraftServer server = ((WorldServer)l).getServer();
|
||||
VehicleEnterEvent event = new VehicleEnterEvent(
|
||||
Type.VEHICLE_ENTER,
|
||||
minecart,
|
||||
((WorldServer)l).getWorld().toCraftEntity(entityplayer));
|
||||
server.getPluginManager().callEvent(event);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
return true;
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
public boolean a(EntityPlayer entityplayer) {
|
||||
if (d == 0) {
|
||||
if (j != null && (j instanceof EntityPlayer) && j != entityplayer) {
|
||||
return true;
|
||||
}
|
||||
if (!l.z) {
|
||||
// CraftBukkit start
|
||||
CraftServer server = ((WorldServer)l).getServer();
|
||||
VehicleEnterEvent event = new VehicleEnterEvent(
|
||||
Type.VEHICLE_ENTER,
|
||||
minecart,
|
||||
((WorldServer)l).getWorld().toCraftEntity(entityplayer));
|
||||
server.getPluginManager().callEvent(event);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
return true;
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
entityplayer.e(this);
|
||||
}
|
||||
} else if (d == 1) {
|
||||
|
18
src/main/java/org/bukkit/craftbukkit/CraftBoat.java
Normale Datei
18
src/main/java/org/bukkit/craftbukkit/CraftBoat.java
Normale Datei
@ -0,0 +1,18 @@
|
||||
package org.bukkit.craftbukkit;
|
||||
|
||||
import net.minecraft.server.EntityBoat;
|
||||
import org.bukkit.Boat;
|
||||
|
||||
/**
|
||||
* A minecart.
|
||||
*
|
||||
* @author sk89q
|
||||
*/
|
||||
public class CraftBoat extends CraftVehicle implements Boat {
|
||||
protected EntityBoat boat;
|
||||
|
||||
public CraftBoat(CraftServer server, EntityBoat entity) {
|
||||
super(server, entity);
|
||||
boat = entity;
|
||||
}
|
||||
}
|
@ -1,9 +1,7 @@
|
||||
package org.bukkit.craftbukkit;
|
||||
|
||||
import net.minecraft.server.EntityMinecart;
|
||||
import org.bukkit.LivingEntity;
|
||||
import org.bukkit.Minecart;
|
||||
import org.bukkit.Vector;
|
||||
|
||||
/**
|
||||
* A minecart.
|
||||
@ -38,16 +36,6 @@ public class CraftMinecart extends CraftVehicle implements Minecart {
|
||||
minecart = entity;
|
||||
}
|
||||
|
||||
public Vector getVelocity() {
|
||||
return new Vector(minecart.s, minecart.t, minecart.u);
|
||||
}
|
||||
|
||||
public void setVelocity(Vector vel) {
|
||||
minecart.s = vel.getX();
|
||||
minecart.t = vel.getY();
|
||||
minecart.u = vel.getZ();
|
||||
}
|
||||
|
||||
public void setDamage(int damage) {
|
||||
minecart.a = damage;
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
package org.bukkit.craftbukkit;
|
||||
|
||||
import org.bukkit.Entity;
|
||||
import org.bukkit.Vector;
|
||||
import org.bukkit.Vehicle;
|
||||
|
||||
/**
|
||||
@ -9,8 +10,11 @@ import org.bukkit.Vehicle;
|
||||
* @author sk89q
|
||||
*/
|
||||
public abstract class CraftVehicle extends CraftEntity implements Vehicle {
|
||||
private net.minecraft.server.Entity vehicle;
|
||||
|
||||
public CraftVehicle(CraftServer server, net.minecraft.server.Entity entity) {
|
||||
super(server, entity);
|
||||
vehicle = entity;
|
||||
}
|
||||
|
||||
public Entity getPassenger() {
|
||||
@ -20,4 +24,14 @@ public abstract class CraftVehicle extends CraftEntity implements Vehicle {
|
||||
public boolean isEmpty() {
|
||||
return getHandle().j == null;
|
||||
}
|
||||
|
||||
public Vector getVelocity() {
|
||||
return new Vector(vehicle.s, vehicle.t, vehicle.u);
|
||||
}
|
||||
|
||||
public void setVelocity(Vector vel) {
|
||||
vehicle.s = vel.getX();
|
||||
vehicle.t = vel.getY();
|
||||
vehicle.u = vel.getZ();
|
||||
}
|
||||
}
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren