From ca47ccf67421bbc2e6d7f40bd89cdc58d8d34d6e Mon Sep 17 00:00:00 2001 From: sk89q Date: Mon, 3 Jan 2011 14:11:04 +0800 Subject: [PATCH] Renamed ArrowEntity->Arrow to be consistent. --- .../java/org/bukkit/craftbukkit/CraftArrow.java | 15 +++++++++++++++ .../org/bukkit/craftbukkit/CraftArrowEntity.java | 15 --------------- .../java/org/bukkit/craftbukkit/CraftWorld.java | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 src/main/java/org/bukkit/craftbukkit/CraftArrow.java delete mode 100644 src/main/java/org/bukkit/craftbukkit/CraftArrowEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/CraftArrow.java new file mode 100644 index 0000000000..b9dd0c3ead --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/CraftArrow.java @@ -0,0 +1,15 @@ +package org.bukkit.craftbukkit; + +import org.bukkit.Arrow; +import net.minecraft.server.EntityArrow; + +/** + * Represents an arrow. + * + * @author sk89q + */ +public class CraftArrow extends CraftEntity implements Arrow { + CraftArrow(CraftServer server, EntityArrow entity) { + super(server, entity); + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftArrowEntity.java b/src/main/java/org/bukkit/craftbukkit/CraftArrowEntity.java deleted file mode 100644 index 337426d3f9..0000000000 --- a/src/main/java/org/bukkit/craftbukkit/CraftArrowEntity.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.bukkit.craftbukkit; - -import org.bukkit.ArrowEntity; -import net.minecraft.server.EntityArrow; - -/** - * Represents an arrow. - * - * @author sk89q - */ -public class CraftArrowEntity extends CraftEntity implements ArrowEntity { - CraftArrowEntity(CraftServer server, EntityArrow entity) { - super(server, entity); - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 20fd62ade1..9c03efff80 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -8,7 +8,7 @@ import net.minecraft.server.WorldGenBigTree; import net.minecraft.server.WorldGenTrees; import net.minecraft.server.WorldServer; import net.minecraft.server.EntityArrow; -import org.bukkit.ArrowEntity; +import org.bukkit.Arrow; import org.bukkit.Block; import org.bukkit.Chunk; import org.bukkit.Location; @@ -79,13 +79,13 @@ public class CraftWorld implements World { return world; } - public ArrowEntity spawnArrow(Location loc, Vector velocity, float speed, + public Arrow spawnArrow(Location loc, Vector velocity, float speed, float spread) { EntityArrow arrow = new EntityArrow(world); arrow.c(loc.getX(), loc.getY(), loc.getZ()); world.a(arrow); arrow.a(velocity.getX(), velocity.getY(), velocity.getZ(), speed, spread); - return new CraftArrowEntity(world.getServer(), arrow); + return new CraftArrow(world.getServer(), arrow); } public boolean generateTree(Location loc) {