Merge branch 'master' into pre/1.13

* master:
  Remove no longer needed tests due to last change
This commit is contained in:
Aikar
2018-09-09 01:14:52 -04:00
5 changed files with 47 additions and 10 deletions

View File

@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
internal code.
diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
index ab9e81fd..a7b8f869 100644
index ab9e81fd2..a7b8f869c 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java
@@ -0,0 +0,0 @@ import org.bukkit.inventory.ItemStack;