summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-08-25 14:52:01 +1000
committermd_5 <git@md-5.net>2018-08-25 14:52:01 +1000
commit07ae1eea99b17f678fa014520229af561c3a09f6 (patch)
tree127d3374c61c123e6acc1a4a979a9ff990d7170e /src
parentfd6a980affe4ec8ba565e0866e6106ab051f97fd (diff)
downloadbukkit-07ae1eea99b17f678fa014520229af561c3a09f6.tar
bukkit-07ae1eea99b17f678fa014520229af561c3a09f6.tar.gz
bukkit-07ae1eea99b17f678fa014520229af561c3a09f6.tar.lz
bukkit-07ae1eea99b17f678fa014520229af561c3a09f6.tar.xz
bukkit-07ae1eea99b17f678fa014520229af561c3a09f6.zip
Remove draft status from BlockData merge / matches
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/block/data/BlockData.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
index 3f64c741..b78260c7 100644
--- a/src/main/java/org/bukkit/block/data/BlockData.java
+++ b/src/main/java/org/bukkit/block/data/BlockData.java
@@ -32,9 +32,7 @@ public interface BlockData extends Cloneable {
*
* @param data the data to merge from
* @return a new instance of this blockdata with the merged data
- * @deprecated draft API
*/
- @Deprecated
BlockData merge(BlockData data);
/**
@@ -51,9 +49,7 @@ public interface BlockData extends Cloneable {
*
* @param data the data to match against (normally a parsed constant)
* @return if there is a match
- * @deprecated draft API
*/
- @Deprecated
boolean matches(BlockData data);
/**