Update upstream CB/S

This commit is contained in:
Zach Brown
2017-06-18 20:36:55 -05:00
parent 43e2c9c48c
commit 1c208bf05b
147 changed files with 327 additions and 347 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add source to PlayerExpChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index 4b3816465..14431b8ad 100644
index b200bbf6..ec23eb98 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -0,0 +0,0 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index 4b3816465..14431b8ad 100644
this.die();
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index d77eefd6f..999e38878 100644
index 1caf1463..c0794a5b 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ import org.bukkit.entity.Player;