From 07ae1eea99b17f678fa014520229af561c3a09f6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 25 Aug 2018 14:52:01 +1000
Subject: Remove draft status from BlockData merge / matches

---
 src/main/java/org/bukkit/block/data/BlockData.java | 4 ----
 1 file changed, 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);
 
     /**
-- 
cgit v1.2.3