summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2011-07-27 21:09:07 -0400
committerEvilSeph <evilseph@gmail.com>2011-07-27 23:18:33 -0400
commitf3fcc6f81fc7fb5be1997bb999940978636c6121 (patch)
tree0264a7dc2e60953f23e4e3a8f01a3a2d6a1dd9a2
parentca86ea1eb7cc4e86c5030585fd7eca9f098a93bb (diff)
downloadbukkit-f3fcc6f81fc7fb5be1997bb999940978636c6121.tar
bukkit-f3fcc6f81fc7fb5be1997bb999940978636c6121.tar.gz
bukkit-f3fcc6f81fc7fb5be1997bb999940978636c6121.tar.lz
bukkit-f3fcc6f81fc7fb5be1997bb999940978636c6121.tar.xz
bukkit-f3fcc6f81fc7fb5be1997bb999940978636c6121.zip
Removed deprecated methods.
getNote() that returns a byte has been replaced by getRawNote(). teleportTo(Location) has been replaced by teleport(location). teleportTo(Entity) has been replaced by teleport(Entity). SnowForm event has been replaced by BlockForm event.
-rw-r--r--src/main/java/org/bukkit/block/NoteBlock.java18
-rw-r--r--src/main/java/org/bukkit/entity/Entity.java16
-rw-r--r--src/main/java/org/bukkit/event/Event.java6
-rw-r--r--src/main/java/org/bukkit/event/block/BlockListener.java9
-rw-r--r--src/main/java/org/bukkit/event/block/SnowFormEvent.java64
-rw-r--r--src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java7
6 files changed, 0 insertions, 120 deletions
diff --git a/src/main/java/org/bukkit/block/NoteBlock.java b/src/main/java/org/bukkit/block/NoteBlock.java
index de71cb5e..658dcf13 100644
--- a/src/main/java/org/bukkit/block/NoteBlock.java
+++ b/src/main/java/org/bukkit/block/NoteBlock.java
@@ -12,15 +12,6 @@ public interface NoteBlock extends BlockState {
* Gets the note.
*
* @return
- * @deprecated use {@link #getRawNote()} instead
- */
- @Deprecated
- public byte getNote();
-
- /**
- * Gets the note.
- *
- * @return
*/
public byte getRawNote();
@@ -28,15 +19,6 @@ public interface NoteBlock extends BlockState {
* Set the note.
*
* @param note
- * @deprecated use {@link #setRawNote(byte)} instead
- */
- @Deprecated
- public void setNote(byte note);
-
- /**
- * Set the note.
- *
- * @param note
*/
public void setNote(Note note);
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index d8c59cc6..6ae2a782 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -59,22 +59,6 @@ public interface Entity {
public boolean teleport(Entity destination);
/**
- * Teleports this entity to the given location
- *
- * @param location New location to teleport this entity to
- * @deprecated use {@link #teleport(Location)}
- */
- public void teleportTo(Location location);
-
- /**
- * Teleports this entity to the target Entity
- *
- * @param destination Entity to teleport this entity to
- * @deprecated use {@link #teleport(Entity)}
- */
- public void teleportTo(Entity destination);
-
- /**
* Returns a list of entities within a bounding box defined by x,y,z centered around player
*
* @param x Size of the box along x axis
diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java
index 80e03418..5aa765f0 100644
--- a/src/main/java/org/bukkit/event/Event.java
+++ b/src/main/java/org/bukkit/event/Event.java
@@ -381,12 +381,6 @@ public abstract class Event implements Serializable {
*/
BLOCK_BREAK (Category.BLOCK),
/**
- * Called when world attempts to place a snow block during a snowfall
- *
- * @see org.bukkit.event.block.SnowFormEvent
- */
- SNOW_FORM (Category.BLOCK),
- /**
* Called when a block is formed based on world conditions
*
* @see org.bukkit.event.block.BlockFormEvent
diff --git a/src/main/java/org/bukkit/event/block/BlockListener.java b/src/main/java/org/bukkit/event/block/BlockListener.java
index 1b51b0f2..287a9153 100644
--- a/src/main/java/org/bukkit/event/block/BlockListener.java
+++ b/src/main/java/org/bukkit/event/block/BlockListener.java
@@ -119,15 +119,6 @@ public class BlockListener implements Listener {
public void onBlockBreak(BlockBreakEvent event) {}
/**
- * Called when a world is attempting to place a block during a snowfall.
- *
- * @param event Relevant event details
- * @deprecated Be prepared to use onBlockForm instead as it will be replacing this event after the RB
- */
- @Deprecated
- public void onSnowForm(SnowFormEvent event) {}
-
- /**
* Called when a block is formed or spreads based on world conditions.
* Use {@link BlockSpreadEvent} to catch blocks that actually spread and don't just "randomly" form.
*<p />
diff --git a/src/main/java/org/bukkit/event/block/SnowFormEvent.java b/src/main/java/org/bukkit/event/block/SnowFormEvent.java
deleted file mode 100644
index 7d9ea69d..00000000
--- a/src/main/java/org/bukkit/event/block/SnowFormEvent.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bukkit.event.block;
-
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.event.Cancellable;
-
-/**
- * Called on snow formed by weather
- */
-public class SnowFormEvent extends BlockEvent implements Cancellable {
- private Material material;
- private byte data;
- private boolean cancel;
-
- public SnowFormEvent(Block block) {
- super(Type.SNOW_FORM, block);
- this.material = Material.SNOW;
- this.cancel = false;
- }
-
- /**
- * Gets the material being placed on a block during snowfall
- *
- * @return the material being placed by a snowfall
- */
- public Material getMaterial() {
- return material;
- }
-
- /**
- * Sets the material to be placed on a block during a snowfall
- *
- * @param material the material to be placed during a snowfall
- */
- public void setMaterial(Material material) {
- this.material = material;
- }
-
- /**
- * Gets the block data of a block involved in a snowfall
- *
- * @return the data of the block being placed by a snowfall
- */
- public byte getData() {
- return data;
- }
-
- /**
- * Sets the block data of a block involved in a snowfall
- *
- * @param data
- */
- public void setData(byte data) {
- this.data = data;
- }
-
- public boolean isCancelled() {
- return cancel;
- }
-
- public void setCancelled(boolean cancel) {
- this.cancel = cancel;
- }
-}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index e0b3b53e..1bc795dd 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -491,13 +491,6 @@ public final class JavaPluginLoader implements PluginLoader {
}
};
- case SNOW_FORM:
- return new EventExecutor() {
- public void execute(Listener listener, Event event) {
- ((BlockListener) listener).onSnowForm((SnowFormEvent) event);
- }
- };
-
case BLOCK_FORM:
return new EventExecutor() {
public void execute(Listener listener, Event event) {