mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-15 20:23:53 -07:00
Update upstream B/CB/S
--- work/Bukkit Submodule work/Bukkit 3aee9dbd0..0828ce366: > Add SpawnReason.SHEARING > SPIGOT-4339: Add EntityTransformEvent --- work/CraftBukkit Submodule work/CraftBukkit 17ff1e046..c2035aa1d: > Add some missing CreatureSpawnEvent.SpawnReason calls > SPIGOT-4339: Add EntityTransformEvent --- work/Spigot Submodule work/Spigot 947a8e7fd..5696c83c1: > Rebuild patches
This commit is contained in:
@@ -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 3155ed9487..1e25ade7cf 100644
|
||||
index 3155ed94..1e25ade7 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 3155ed9487..1e25ade7cf 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 323e4002fb..c225c9e352 100644
|
||||
index 2132b09c..45cba844 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;
|
||||
|
Reference in New Issue
Block a user