Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 05:47:45 +01:00
Code Issues Projects Releases Wiki Activity

Update to Minecraft 1.12.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot 2017-08-03 23:00:00 +10:00
parent df8a6926fd
commit 5727987ab3
2 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
paper-api/pom.xml
View File

@ -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>

29
paper-api/src/main/java/org/bukkit/entity/LivingEntity.java
View File

@ -57,19 +57,6 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
*/
public List<Block> getLineOfSight(Set<Material> transparent, int maxDistance);
/**
* 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.
*
@ -81,22 +68,6 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
*/
public Block getTargetBlock(Set<Material> 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 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>