summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityBoat.java
diff options
context:
space:
mode:
authorWesley Wolfe <weswolf@aol.com>2012-07-22 01:18:00 -0500
committerWesley Wolfe <weswolf@aol.com>2012-07-23 23:55:31 -0500
commitb00de5f1768e14238f8660b63eb3fd5d744fc0a9 (patch)
tree2c1407b1ef81f38e16f3c4e453bec077dfd1eb53 /src/main/java/net/minecraft/server/EntityBoat.java
parent8b9aad8c2b4057ab33a7bff2b8711d0d48c13568 (diff)
downloadcraftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar
craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.gz
craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.lz
craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.xz
craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.zip
Cleaned up CraftBukkit comments in NMS.
Added newlines at the end of files Fixed improper line endings on some files Matched start - end comments Added some missing comments for diffs Fixed syntax on some spots Minimized some diff Removed some no longer used files Added comment on some required files with no changes Fixed imports of items used once Added imports for items used more than once
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityBoat.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityBoat.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index c72413ba..88b98447 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -5,13 +5,10 @@ import java.util.List;
// CraftBukkit start
import org.bukkit.Location;
import org.bukkit.entity.Vehicle;
-import org.bukkit.event.vehicle.VehicleCreateEvent;
import org.bukkit.event.vehicle.VehicleDamageEvent;
import org.bukkit.event.vehicle.VehicleDestroyEvent;
-import org.bukkit.event.vehicle.VehicleEnterEvent;
import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
import org.bukkit.event.vehicle.VehicleMoveEvent;
-import org.bukkit.event.vehicle.VehicleUpdateEvent;
// CraftBukkit end
public class EntityBoat extends Entity {
@@ -83,7 +80,7 @@ public class EntityBoat extends Entity {
this.lastY = d1;
this.lastZ = d2;
- this.world.getServer().getPluginManager().callEvent(new VehicleCreateEvent((Vehicle) this.getBukkitEntity())); // CraftBukkit
+ this.world.getServer().getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleCreateEvent((Vehicle) this.getBukkitEntity())); // CraftBukkit
}
public double x_() {
@@ -307,7 +304,6 @@ public class EntityBoat extends Entity {
this.world.getServer().getPluginManager().callEvent(destroyEvent);
if (!destroyEvent.isCancelled()) {
- // CraftBukkit end
this.die();
int k;
@@ -319,7 +315,8 @@ public class EntityBoat extends Entity {
for (k = 0; k < 2; ++k) {
this.a(Item.STICK.id, 1, 0.0F);
}
- } // CraftBukkit
+ }
+ // CraftBukkit end
}
} else {
this.motX *= 0.9900000095367432D;
@@ -364,7 +361,7 @@ public class EntityBoat extends Entity {
Location to = new Location(bworld, this.locX, this.locY, this.locZ, this.yaw, this.pitch);
Vehicle vehicle = (Vehicle) this.getBukkitEntity();
- server.getPluginManager().callEvent(new VehicleUpdateEvent(vehicle));
+ server.getPluginManager().callEvent(new org.bukkit.event.vehicle.VehicleUpdateEvent(vehicle));
if (!from.equals(to)) {
VehicleMoveEvent event = new VehicleMoveEvent(vehicle, from, to);