summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorsk89q <the.sk89q@gmail.com>2011-01-03 14:11:04 +0800
committerDinner Bone <dinnerbone@dinnerbone.com>2011-01-03 22:15:26 +0800
commitca47ccf67421bbc2e6d7f40bd89cdc58d8d34d6e (patch)
tree0b4c90eecf524076a12a9e7b2d8fb01eb5d583b4 /src/main
parent31c5894743d1c0701de7d0d89184467a5a82e6d8 (diff)
downloadcraftbukkit-ca47ccf67421bbc2e6d7f40bd89cdc58d8d34d6e.tar
craftbukkit-ca47ccf67421bbc2e6d7f40bd89cdc58d8d34d6e.tar.gz
craftbukkit-ca47ccf67421bbc2e6d7f40bd89cdc58d8d34d6e.tar.lz
craftbukkit-ca47ccf67421bbc2e6d7f40bd89cdc58d8d34d6e.tar.xz
craftbukkit-ca47ccf67421bbc2e6d7f40bd89cdc58d8d34d6e.zip
Renamed ArrowEntity->Arrow to be consistent.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftArrow.java15
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftArrowEntity.java15
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftWorld.java6
3 files changed, 18 insertions, 18 deletions
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 00000000..b9dd0c3e
--- /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 337426d3..00000000
--- 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 20fd62ad..9c03efff 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) {