diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-15 21:20:59 +0000 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-15 21:20:59 +0000 |
| commit | 4764962cf94b73782a49fe351a55cb47e9550044 (patch) | |
| tree | 8768194f77603bbcb663ffc88e5bfc97b83c1cb8 /src | |
| parent | 194ef1a5d43ba7c20e5052c273a00d1d59d8bcd1 (diff) | |
| download | bukkit-4764962cf94b73782a49fe351a55cb47e9550044.tar bukkit-4764962cf94b73782a49fe351a55cb47e9550044.tar.gz bukkit-4764962cf94b73782a49fe351a55cb47e9550044.tar.lz bukkit-4764962cf94b73782a49fe351a55cb47e9550044.tar.xz bukkit-4764962cf94b73782a49fe351a55cb47e9550044.zip | |
All entity stuff in org.bukkit moved to org.bukkit.entity
Diffstat (limited to 'src')
46 files changed, 282 insertions, 257 deletions
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java index f3556922..268faf3d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1,6 +1,7 @@ package org.bukkit; +import org.bukkit.entity.Player; import java.util.List; import org.bukkit.plugin.PluginManager; diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java index 45acbeca..c2d9432d 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1,6 +1,13 @@ package org.bukkit; +import org.bukkit.entity.ItemDrop; +import org.bukkit.entity.PoweredMinecart; +import org.bukkit.entity.Minecart; +import org.bukkit.entity.StorageMinecart; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Boat; + /** * Represents a world. * diff --git a/src/main/java/org/bukkit/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java index bdbe263b..90efb643 100644 --- a/src/main/java/org/bukkit/Arrow.java +++ b/src/main/java/org/bukkit/entity/Arrow.java @@ -1,4 +1,4 @@ -package org.bukkit;
+package org.bukkit.entity;
/**
* Represents an arrow.
diff --git a/src/main/java/org/bukkit/Boat.java b/src/main/java/org/bukkit/entity/Boat.java index 33958ec0..9cb3b810 100644 --- a/src/main/java/org/bukkit/Boat.java +++ b/src/main/java/org/bukkit/entity/Boat.java @@ -1,4 +1,4 @@ -package org.bukkit;
+package org.bukkit.entity;
/**
* Represents a boat entity.
diff --git a/src/main/java/org/bukkit/Egg.java b/src/main/java/org/bukkit/entity/Egg.java index dc0beb2e..c7b3d022 100644 --- a/src/main/java/org/bukkit/Egg.java +++ b/src/main/java/org/bukkit/entity/Egg.java @@ -1,4 +1,4 @@ -package org.bukkit;
+package org.bukkit.entity;
/**
* Represents an egg.
diff --git a/src/main/java/org/bukkit/Entity.java b/src/main/java/org/bukkit/entity/Entity.java index 1ffa8501..42e0cf49 100644 --- a/src/main/java/org/bukkit/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -1,5 +1,8 @@ -package org.bukkit; +package org.bukkit.entity; + +import org.bukkit.Location; +import org.bukkit.World; /** * Represents a base entity in the world diff --git a/src/main/java/org/bukkit/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java index 04b391a8..34ea3e8c 100644 --- a/src/main/java/org/bukkit/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -1,5 +1,8 @@ -package org.bukkit; +package org.bukkit.entity; + +import org.bukkit.ItemStack; +import org.bukkit.PlayerInventory; /** * Represents a human entity, such as an NPC or a player diff --git a/src/main/java/org/bukkit/ItemDrop.java b/src/main/java/org/bukkit/entity/ItemDrop.java index 3e2fd598..0ab8ab0a 100644 --- a/src/main/java/org/bukkit/ItemDrop.java +++ b/src/main/java/org/bukkit/entity/ItemDrop.java @@ -1,4 +1,6 @@ -package org.bukkit;
+package org.bukkit.entity;
+
+import org.bukkit.ItemStack;
/**
* Represents a dropped item.
diff --git a/src/main/java/org/bukkit/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java index f0987ba2..e58122d1 100644 --- a/src/main/java/org/bukkit/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1,5 +1,5 @@ -package org.bukkit; +package org.bukkit.entity; /** * Represents a living entity, such as a monster or player diff --git a/src/main/java/org/bukkit/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java index 275a084e..d4469a4c 100644 --- a/src/main/java/org/bukkit/Minecart.java +++ b/src/main/java/org/bukkit/entity/Minecart.java @@ -1,4 +1,4 @@ -package org.bukkit;
+package org.bukkit.entity;
/**
* Represents a minecart entity.
diff --git a/src/main/java/org/bukkit/MobType.java b/src/main/java/org/bukkit/entity/MobType.java index 0290c926..7f52a7ad 100644 --- a/src/main/java/org/bukkit/MobType.java +++ b/src/main/java/org/bukkit/entity/MobType.java @@ -1,4 +1,4 @@ -package org.bukkit; +package org.bukkit.entity; public enum MobType { CHICKEN("Chicken"), diff --git a/src/main/java/org/bukkit/Player.java b/src/main/java/org/bukkit/entity/Player.java index eb6cc73a..d02d97fa 100644 --- a/src/main/java/org/bukkit/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,5 +1,5 @@ -package org.bukkit; +package org.bukkit.entity; import java.net.InetSocketAddress; diff --git a/src/main/java/org/bukkit/PoweredMinecart.java b/src/main/java/org/bukkit/entity/PoweredMinecart.java index c6ca4716..66f5ba7f 100644 --- a/src/main/java/org/bukkit/PoweredMinecart.java +++ b/src/main/java/org/bukkit/entity/PoweredMinecart.java @@ -1,4 +1,4 @@ -package org.bukkit;
+package org.bukkit.entity;
/**
* Represents a powered minecart.
diff --git a/src/main/java/org/bukkit/Snowball.java b/src/main/java/org/bukkit/entity/Snowball.java index cebe0dff..69ac03ab 100644 --- a/src/main/java/org/bukkit/Snowball.java +++ b/src/main/java/org/bukkit/entity/Snowball.java @@ -1,4 +1,4 @@ -package org.bukkit;
+package org.bukkit.entity;
/**
* Implements a snowball.
diff --git a/src/main/java/org/bukkit/StorageMinecart.java b/src/main/java/org/bukkit/entity/StorageMinecart.java index 7ec1b5ac..6b0f2e32 100644 --- a/src/main/java/org/bukkit/StorageMinecart.java +++ b/src/main/java/org/bukkit/entity/StorageMinecart.java @@ -1,4 +1,6 @@ -package org.bukkit;
+package org.bukkit.entity;
+
+import org.bukkit.Inventory;
/**
* Represents a storage minecart.
diff --git a/src/main/java/org/bukkit/Vehicle.java b/src/main/java/org/bukkit/entity/Vehicle.java index 76b7267b..1d618913 100644 --- a/src/main/java/org/bukkit/Vehicle.java +++ b/src/main/java/org/bukkit/entity/Vehicle.java @@ -1,4 +1,6 @@ -package org.bukkit;
+package org.bukkit.entity;
+
+import org.bukkit.Vector;
/**
* Represents a vehicle entity.
diff --git a/src/main/java/org/bukkit/event/block/BlockDamageEvent.java b/src/main/java/org/bukkit/event/block/BlockDamageEvent.java index 1bd4201d..fa4b3d23 100644 --- a/src/main/java/org/bukkit/event/block/BlockDamageEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockDamageEvent.java @@ -2,7 +2,7 @@ package org.bukkit.event.block; import org.bukkit.Block; import org.bukkit.BlockDamageLevel; -import org.bukkit.Player; +import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; /** diff --git a/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java b/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java index c43a6a2b..90a14ca6 100644 --- a/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockIgniteEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.block; import org.bukkit.Block; -import org.bukkit.Player; +import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/src/main/java/org/bukkit/event/block/BlockInteractEvent.java b/src/main/java/org/bukkit/event/block/BlockInteractEvent.java index 37a343ad..a3e28c26 100644 --- a/src/main/java/org/bukkit/event/block/BlockInteractEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockInteractEvent.java @@ -1,8 +1,8 @@ package org.bukkit.event.block;
import org.bukkit.Block;
-import org.bukkit.LivingEntity;
-import org.bukkit.Player;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
/**
diff --git a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java b/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java index a2ba16ed..4074b338 100644 --- a/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPlaceEvent.java @@ -2,7 +2,7 @@ package org.bukkit.event.block; import org.bukkit.Block; import org.bukkit.ItemStack; -import org.bukkit.Player; +import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; /** diff --git a/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java b/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java index dff08f08..d0df4c1b 100644 --- a/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java @@ -3,7 +3,7 @@ package org.bukkit.event.block; import org.bukkit.Block; import org.bukkit.BlockFace; import org.bukkit.ItemStack; -import org.bukkit.Player; +import org.bukkit.entity.Player; /** * Not implemented yet diff --git a/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java b/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java index e47bb8c0..6f404f59 100644 --- a/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityCombustEvent.java @@ -1,6 +1,6 @@ package org.bukkit.event.entity; -import org.bukkit.Entity; +import org.bukkit.entity.Entity; import org.bukkit.event.Cancellable; /** diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java index 44e14060..dfdd2c77 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.entity; import org.bukkit.Block; -import org.bukkit.Entity; +import org.bukkit.entity.Entity; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java index 716a57ba..c2b347e5 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java @@ -1,6 +1,6 @@ package org.bukkit.event.entity; -import org.bukkit.Entity; +import org.bukkit.entity.Entity; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java index 332470c3..e073fce0 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java @@ -1,6 +1,6 @@ package org.bukkit.event.entity; -import org.bukkit.Entity; +import org.bukkit.entity.Entity; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/src/main/java/org/bukkit/event/entity/EntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityEvent.java index dcd60372..a4f4911c 100644 --- a/src/main/java/org/bukkit/event/entity/EntityEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityEvent.java @@ -1,6 +1,6 @@ package org.bukkit.event.entity; -import org.bukkit.Entity; +import org.bukkit.entity.Entity; import org.bukkit.event.Event; /** diff --git a/src/main/java/org/bukkit/event/player/PlayerChatEvent.java b/src/main/java/org/bukkit/event/player/PlayerChatEvent.java index b97ac5a6..047b270f 100644 --- a/src/main/java/org/bukkit/event/player/PlayerChatEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerChatEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.player; -import org.bukkit.Player; +import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; /** diff --git a/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java b/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java index f1c26b93..391cc6bc 100644 --- a/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerEggThrowEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.player; -import org.bukkit.MobType; -import org.bukkit.Player; +import org.bukkit.entity.MobType; +import org.bukkit.entity.Player; /** diff --git a/src/main/java/org/bukkit/event/player/PlayerEvent.java b/src/main/java/org/bukkit/event/player/PlayerEvent.java index 2e4ea068..2e176535 100644 --- a/src/main/java/org/bukkit/event/player/PlayerEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerEvent.java @@ -1,25 +1,25 @@ - -package org.bukkit.event.player; - -import org.bukkit.Player; -import org.bukkit.event.Event; - -/** - * Represents a player related event - */ -public class PlayerEvent extends Event { - protected Player player; - - public PlayerEvent(final Event.Type type, final Player who) { - super(type); - player = who; - } - - /** - * Returns the player involved in this event - * @return Player who is involved in this event - */ - public final Player getPlayer() { - return player; - } -} +
+package org.bukkit.event.player;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+
+/**
+ * Represents a player related event
+ */
+public class PlayerEvent extends Event {
+ protected Player player;
+
+ public PlayerEvent(final Event.Type type, final Player who) {
+ super(type);
+ player = who;
+ }
+
+ /**
+ * Returns the player involved in this event
+ * @return Player who is involved in this event
+ */
+ public final Player getPlayer() {
+ return player;
+ }
+}
diff --git a/src/main/java/org/bukkit/event/player/PlayerItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemEvent.java index a77194be..af727972 100644 --- a/src/main/java/org/bukkit/event/player/PlayerItemEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerItemEvent.java @@ -4,7 +4,7 @@ import org.bukkit.Block; import org.bukkit.BlockFace;
import org.bukkit.ItemStack;
import org.bukkit.Material;
-import org.bukkit.Player;
+import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
/**
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java index e19475a9..7aedea50 100644 --- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java @@ -1,104 +1,104 @@ - -package org.bukkit.event.player; - -import org.bukkit.Player; - -/** - * Stores details for players attempting to log in - */ -public class PlayerLoginEvent extends PlayerEvent { - private Result result; - private String message; - - public PlayerLoginEvent(final Type type, final Player player) { - super(type, player); - this.result = Result.ALLOWED; - this.message = ""; - } - - public PlayerLoginEvent(final Type type, final Player player, final Result result, final String message) { - super(type, player); - this.result = result; - this.message = message; - } - - /** - * Gets the current result of the login, as an enum - * - * @return Current Result of the login - */ - public Result getResult() { - return result; - } - - /** - * Sets the new result of the login, as an enum - * - * @param result New result to set - */ - public void setResult(final Result result) { - this.result = result; - } - - /** - * Gets the current kick message that will be used if getResult() != Result.ALLOWED - * - * @return Current kick message - */ - public String getKickMessage() { - return message; - } - - /** - * Sets the kick message to display if getResult() != Result.ALLOWED - * - * @param message New kick message - */ - public void setKickMessage(final String message) { - this.message = message; - } - - /** - * Allows the player to log in - */ - public void allow() { - result = Result.ALLOWED; - message = ""; - } - - /** - * Disallows the player from logging in, with the given reason - * - * @param result New result for disallowing the player - * @param message Kick message to display to the user - */ - public void disallow(final Result result, final String message) { - this.result = result; - this.message = message; - } - - /** - * Basic kick reasons for communicating to plugins - */ - public enum Result { - /** - * The player is allowed to log in - */ - ALLOWED, - - /** - * The player is not allowed to log in, due to the server being full - */ - KICK_FULL, - - /** - * The player is not allowed to log in, due to them being banned - */ - KICK_BANNED, - - /** - * The player is not allowed to log in, for reasons undefined - */ - KICK_OTHER - } -} +
+package org.bukkit.event.player;
+
+import org.bukkit.entity.Player;
+
+/**
+ * Stores details for players attempting to log in
+ */
+public class PlayerLoginEvent extends PlayerEvent {
+ private Result result;
+ private String message;
+
+ public PlayerLoginEvent(final Type type, final Player player) {
+ super(type, player);
+ this.result = Result.ALLOWED;
+ this.message = "";
+ }
+
+ public PlayerLoginEvent(final Type type, final Player player, final Result result, final String message) {
+ super(type, player);
+ this.result = result;
+ this.message = message;
+ }
+
+ /**
+ * Gets the current result of the login, as an enum
+ *
+ * @return Current Result of the login
+ */
+ public Result getResult() {
+ return result;
+ }
+
+ /**
+ * Sets the new result of the login, as an enum
+ *
+ * @param result New result to set
+ */
+ public void setResult(final Result result) {
+ this.result = result;
+ }
+
+ /**
+ * Gets the current kick message that will be used if getResult() != Result.ALLOWED
+ *
+ * @return Current kick message
+ */
+ public String getKickMessage() {
+ return message;
+ }
+
+ /**
+ * Sets the kick message to display if getResult() != Result.ALLOWED
+ *
+ * @param message New kick message
+ */
+ public void setKickMessage(final String message) {
+ this.message = message;
+ }
+
+ /**
+ * Allows the player to log in
+ */
+ public void allow() {
+ result = Result.ALLOWED;
+ message = "";
+ }
+
+ /**
+ * Disallows the player from logging in, with the given reason
+ *
+ * @param result New result for disallowing the player
+ * @param message Kick message to display to the user
+ */
+ public void disallow(final Result result, final String message) {
+ this.result = result;
+ this.message = message;
+ }
+
+ /**
+ * Basic kick reasons for communicating to plugins
+ */
+ public enum Result {
+ /**
+ * The player is allowed to log in
+ */
+ ALLOWED,
+
+ /**
+ * The player is not allowed to log in, due to the server being full
+ */
+ KICK_FULL,
+
+ /**
+ * The player is not allowed to log in, due to them being banned
+ */
+ KICK_BANNED,
+
+ /**
+ * The player is not allowed to log in, for reasons undefined
+ */
+ KICK_OTHER
+ }
+}
diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java index 24b31b59..cbcc9b37 100644 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java @@ -1,86 +1,86 @@ - -package org.bukkit.event.player; - -import org.bukkit.Location; -import org.bukkit.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; - -/** - * Holds information for player movement and teleportation events - */ -public class PlayerMoveEvent extends PlayerEvent implements Cancellable { - private boolean cancel = false; - private Location from; - private Location to; - - public PlayerMoveEvent(final Event.Type type, final Player player, final Location from, final Location to) { - super(type, player); - this.from = from; - this.to = to; - } - - /** - * Gets the cancellation state of this event. A cancelled event will not - * be executed in the server, but will still pass to other plugins - * - * If a move or teleport event is cancelled, the player will be moved or - * teleported back to the Location as defined by getFrom(). This will not - * fire an event - * - * @return true if this event is cancelled - */ - public boolean isCancelled() { - return cancel; - } - - /** - * Sets the cancellation state of this event. A cancelled event will not - * be executed in the server, but will still pass to other plugins - * - * If a move or teleport event is cancelled, the player will be moved or - * teleported back to the Location as defined by getFrom(). This will not - * fire an event - * - * @param cancel true if you wish to cancel this event - */ - public void setCancelled(boolean cancel) { - this.cancel = cancel; - } - - /** - * Gets the location this player moved from - * - * @return Location the player moved from - */ - public Location getFrom() { - return from; - } - - /** - * Sets the location to mark as where the player moved from - * - * @param from New location to mark as the players previous location - */ - public void setFrom(Location from) { - this.from = from; - } - - /** - * Gets the location this player moved to - * - * @return Location the player moved to - */ - public Location getTo() { - return to; - } - - /** - * Sets the location that this player will move to - * - * @param to New Location this player will move to - */ - public void setTo(Location to) { - this.to = to; - } -} +
+package org.bukkit.event.player;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+
+/**
+ * Holds information for player movement and teleportation events
+ */
+public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
+ private boolean cancel = false;
+ private Location from;
+ private Location to;
+
+ public PlayerMoveEvent(final Event.Type type, final Player player, final Location from, final Location to) {
+ super(type, player);
+ this.from = from;
+ this.to = to;
+ }
+
+ /**
+ * Gets the cancellation state of this event. A cancelled event will not
+ * be executed in the server, but will still pass to other plugins
+ *
+ * If a move or teleport event is cancelled, the player will be moved or
+ * teleported back to the Location as defined by getFrom(). This will not
+ * fire an event
+ *
+ * @return true if this event is cancelled
+ */
+ public boolean isCancelled() {
+ return cancel;
+ }
+
+ /**
+ * Sets the cancellation state of this event. A cancelled event will not
+ * be executed in the server, but will still pass to other plugins
+ *
+ * If a move or teleport event is cancelled, the player will be moved or
+ * teleported back to the Location as defined by getFrom(). This will not
+ * fire an event
+ *
+ * @param cancel true if you wish to cancel this event
+ */
+ public void setCancelled(boolean cancel) {
+ this.cancel = cancel;
+ }
+
+ /**
+ * Gets the location this player moved from
+ *
+ * @return Location the player moved from
+ */
+ public Location getFrom() {
+ return from;
+ }
+
+ /**
+ * Sets the location to mark as where the player moved from
+ *
+ * @param from New location to mark as the players previous location
+ */
+ public void setFrom(Location from) {
+ this.from = from;
+ }
+
+ /**
+ * Gets the location this player moved to
+ *
+ * @return Location the player moved to
+ */
+ public Location getTo() {
+ return to;
+ }
+
+ /**
+ * Sets the location that this player will move to
+ *
+ * @param to New Location this player will move to
+ */
+ public void setTo(Location to) {
+ this.to = to;
+ }
+}
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java index 6141c1c1..a16fe0b0 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.vehicle;
import org.bukkit.Block;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
/**
* Raised when a vehicle collides with a block.
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java index 6e4bb48a..da7e2bd9 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java @@ -1,6 +1,6 @@ package org.bukkit.event.vehicle;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
/**
* Raised when a vehicle collides.
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java index 9be4d55b..9cfde547 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleCreateEvent.java @@ -1,6 +1,6 @@ package org.bukkit.event.vehicle;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
/**
* Raised when a vehicle is created.
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java index 3d762e8c..67acac34 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleDamageEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.vehicle;
-import org.bukkit.Entity;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Vehicle;
import org.bukkit.event.Cancellable;
/**
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java index 5ac62428..97e5d930 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleEnterEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.vehicle;
-import org.bukkit.Entity;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Vehicle;
import org.bukkit.event.Cancellable;
/**
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java index 514c5697..c85e6c8b 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.vehicle;
-import org.bukkit.Entity;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Vehicle;
import org.bukkit.event.Cancellable;
/**
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java index b08c3340..78fc757d 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleEvent.java @@ -1,6 +1,6 @@ package org.bukkit.event.vehicle;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
import org.bukkit.event.Event;
/**
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java index 957571ed..d1936c3e 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.vehicle;
-import org.bukkit.LivingEntity;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Vehicle;
import org.bukkit.event.Cancellable;
/**
diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java index 65921ad4..c680dfcb 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java @@ -1,7 +1,7 @@ package org.bukkit.event.vehicle;
import org.bukkit.Location;
-import org.bukkit.Vehicle;
+import org.bukkit.entity.Vehicle;
/**
* Raised when a vehicle moves.
diff --git a/src/main/java/org/bukkit/fillr/Checker.java b/src/main/java/org/bukkit/fillr/Checker.java index f00b1363..24865238 100644 --- a/src/main/java/org/bukkit/fillr/Checker.java +++ b/src/main/java/org/bukkit/fillr/Checker.java @@ -1,5 +1,6 @@ package org.bukkit.fillr; +import org.bukkit.entity.Player; import java.io.*; import java.util.jar.*; import org.bukkit.*; diff --git a/src/main/java/org/bukkit/fillr/Downloader.java b/src/main/java/org/bukkit/fillr/Downloader.java index 3b9d8e75..6a96a5f5 100644 --- a/src/main/java/org/bukkit/fillr/Downloader.java +++ b/src/main/java/org/bukkit/fillr/Downloader.java @@ -1,5 +1,6 @@ package org.bukkit.fillr; +import org.bukkit.entity.Player; import org.bukkit.*; import org.bukkit.plugin.PluginDescriptionFile; diff --git a/src/main/java/org/bukkit/fillr/FillrListener.java b/src/main/java/org/bukkit/fillr/FillrListener.java index f25c111b..a6c22ff4 100644 --- a/src/main/java/org/bukkit/fillr/FillrListener.java +++ b/src/main/java/org/bukkit/fillr/FillrListener.java @@ -1,5 +1,6 @@ package org.bukkit.fillr; +import org.bukkit.entity.Player; import org.bukkit.*; import org.bukkit.event.player.*; diff --git a/src/main/java/org/bukkit/fillr/Getter.java b/src/main/java/org/bukkit/fillr/Getter.java index c1197d48..63a1f4cd 100644 --- a/src/main/java/org/bukkit/fillr/Getter.java +++ b/src/main/java/org/bukkit/fillr/Getter.java @@ -1,5 +1,6 @@ package org.bukkit.fillr; +import org.bukkit.entity.Player; import java.io.File; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/org/bukkit/fillr/Updater.java b/src/main/java/org/bukkit/fillr/Updater.java index 3a301538..a7832952 100644 --- a/src/main/java/org/bukkit/fillr/Updater.java +++ b/src/main/java/org/bukkit/fillr/Updater.java @@ -1,5 +1,6 @@ package org.bukkit.fillr; +import org.bukkit.entity.Player; import org.bukkit.*; import org.bukkit.plugin.*; |