Update to Minecraft 1.12.1

2 files changed, 8 insertions, 32 deletions

diff --git a/pom.xml b/pom.xml
index 5e29b43b..8be63a90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.bukkit</groupId>
     <artifactId>bukkit</artifactId>
-    <version>1.12-R0.1-SNAPSHOT</version>
+    <version>1.12.1-R0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Bukkit</name>
@@ -24,7 +24,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <!-- just until we get deployment to central approved -->
     <distributionManagement>
         <repository>
             <id>spigotmc-releases</id>
@@ -36,7 +35,13 @@
         </snapshotRepository>
     </distributionManagement>
 
-    <!-- required until fixed plexus-compiler-eclipse is deployed -->
+    <repositories>
+        <repository>
+            <id>spigotmc-public</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+    </repositories>
+
     <pluginRepositories>
         <pluginRepository>
             <id>spigotmc-public</id>
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index fc41a43d..5a30fa93 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -60,19 +60,6 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
     /**
      * Gets the block that the living entity has targeted.
      *
-     * @param transparent HashSet containing all transparent block IDs (set to
-     *     null for only air)
-     * @param maxDistance this is the maximum distance to scan (may be limited
-     *     by server by at least 100 blocks, no less)
-     * @return block that the living entity has targeted
-     * @deprecated Magic value
-     */
-    @Deprecated
-    public Block getTargetBlock(HashSet<Byte> transparent, int maxDistance);
-
-    /**
-     * Gets the block that the living entity has targeted.
-     *
      * @param transparent HashSet containing all transparent block Materials (set to
      *     null for only air)
      * @param maxDistance this is the maximum distance to scan (may be limited
@@ -86,22 +73,6 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
      * <p>
      * The target block will be the last block in the list.
      *
-     * @param transparent HashSet containing all transparent block IDs (set to
-     *     null for only air)
-     * @param maxDistance this is the maximum distance to scan. This may be
-     *     further limited by the server, but never to less than 100 blocks
-     * @return list containing the last 2 blocks along the living entity's
-     *     line of sight
-     * @deprecated Magic value
-     */
-    @Deprecated
-    public List<Block> getLastTwoTargetBlocks(HashSet<Byte> transparent, int maxDistance);
-
-    /**
-     * Gets the last two blocks along the living entity's line of sight.
-     * <p>
-     * The target block will be the last block in the list.
-     *
      * @param transparent HashSet containing all transparent block Materials (set to
      *     null for only air)
      * @param maxDistance this is the maximum distance to scan. This may be