summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/command/Command.java17
-rw-r--r--src/main/java/org/bukkit/command/CommandSender.java9
-rw-r--r--src/main/java/org/bukkit/command/PluginCommandYamlParser.java2
-rw-r--r--src/main/java/org/bukkit/entity/Entity.java18
-rw-r--r--src/main/java/org/bukkit/event/block/BlockRightClickEvent.java12
5 files changed, 1 insertions, 57 deletions
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index d80b9283..a6ad86d3 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -56,14 +56,6 @@ public abstract class Command {
}
/**
- * @deprecated Use {@link #getDescription()}
- */
- @Deprecated
- public String getTooltip() {
- return getDescription();
- }
-
- /**
* Gets an example usage of this command
*
* @return One or more example usages
@@ -95,15 +87,6 @@ public abstract class Command {
}
/**
- * @deprecated Use {@link #setDescription(description)}
- */
- @Deprecated
- public Command setTooltip(String tooltip) {
- this.description = tooltip;
- return this;
- }
-
- /**
* Sets the example usage of this command
*
* @param usage New example usage
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
index 9e890bc2..8b670338 100644
--- a/src/main/java/org/bukkit/command/CommandSender.java
+++ b/src/main/java/org/bukkit/command/CommandSender.java
@@ -19,15 +19,6 @@ public interface CommandSender {
public boolean isOp();
/**
- * Checks if this sender is a player
- *
- * @return true if they are
- * @deprecated Use instanceof
- */
- @Deprecated
- public boolean isPlayer();
-
- /**
* Returns the server instance that this command is running on
*
* @return Server instance
diff --git a/src/main/java/org/bukkit/command/PluginCommandYamlParser.java b/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
index 2305e0ed..0bc86a7a 100644
--- a/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
+++ b/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
@@ -26,7 +26,7 @@ public class PluginCommandYamlParser {
Object aliases = entry.getValue().get("aliases");
if (description != null)
- newCmd.setTooltip(description.toString());
+ newCmd.setDescription(description.toString());
if (usage != null) {
newCmd.setUsage(usage.toString());
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 4696e697..f9298746 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -18,24 +18,6 @@ public interface Entity {
public Location getLocation();
/**
- * Gets this entity's current momentum
- *
- * @return Current travelling momentum of this entity
- * @deprecated See {@link #getVelocity()}
- */
- @Deprecated
- public Vector getMomentum();
-
- /**
- * Sets this entity's momentum
- *
- * @param vector New momentum to travel with
- * @deprecated See {@link #setVelocity(org.bukkit.util.Vector)}
- */
- @Deprecated
- public void setMomentum(Vector vector);
-
- /**
* Sets this entity's velocity
*
* @param velocity New velocity to travel with
diff --git a/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java b/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
index da6368f2..66cf6ec2 100644
--- a/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
+++ b/src/main/java/org/bukkit/event/block/BlockRightClickEvent.java
@@ -31,18 +31,6 @@ public class BlockRightClickEvent extends BlockEvent {
return player;
}
-
- /**
- * Get the block that this block was placed against
- *
- * @return Block the block that the new block was placed against
- * @deprecated use getBlock
- */
- @Deprecated
- public Block getBlockAgainst() {
- return clickedBlock;
- }
-
/**
* @return BlockFace the direction this block was clicked
*/