Update upstream B/CB/S

This commit is contained in:
Zach Brown
2018-10-27 00:02:22 -04:00
parent 090b025ed3
commit f29440f891
57 changed files with 221 additions and 227 deletions

View File

@@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
new file mode 100644
index 000000000..50b52d6bf
index 00000000..50b52d6b
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
@@ -0,0 +0,0 @@
@@ -431,7 +431,7 @@ index 000000000..50b52d6bf
+ }
+}
diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
index 4d0acaf5b..827aa00c8 100644
index 4d0acaf5..827aa00c 100644
--- a/src/main/java/org/bukkit/Particle.java
+++ b/src/main/java/org/bukkit/Particle.java
@@ -0,0 +0,0 @@ public enum Particle {
@@ -452,7 +452,7 @@ index 4d0acaf5b..827aa00c8 100644
* Options which can be applied to redstone dust particles - a particle
* color and size.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 9ce6d7d57..d20b940ac 100644
index 99fbf327..1f63eba8 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {