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

Implemented boat, fixed some event issues with minecarts, and implemented the events for boats that were implemented for minecarts.

Browse Source
This commit is contained in:
sk89q
2011-01-07 13:05:25 -08:00
parent 592f510228
commit 22c2fdeaf0
5 changed files with 422 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {