SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  Remove no longer needed tests due to last change
This commit is contained in:
Aikar
2018-09-09 01:14:52 -04:00
parent ae158dbbc8 e0c865681c
commit f848af3df4
5 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-API-Patches/Add-ray-tracing-methods-to-LivingEntity.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
new file mode 100644
index 00000000..fe43d955
index 000000000..fe43d9557
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java
@@ -0,0 +0,0 @@
@@ -61,7 +61,7 @@ index 00000000..fe43d955
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index ac5bd8a5..62e45eda 100644
index ac5bd8a57..62e45eda2 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -0,0 +0,0 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti