Update upstream B/CB

Closes GH-569
This commit is contained in:
Zach Brown
2017-01-06 15:45:59 -06:00
parent 710f32619e
commit b6dd3fb9d3
39 changed files with 111 additions and 270 deletions

View File

@@ -7,7 +7,7 @@ Get the Entity being boosted
Get the firework launcher
diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
index b8a8c075..8c087bb7 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Firework.java
+++ b/src/main/java/org/bukkit/entity/Firework.java
@@ -0,0 +0,0 @@ package org.bukkit.entity;