mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 01:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@ae5e78a4 [ci/skip] Clarify the functionality of AbstractVillager#resetOffers (#13260) PaperMC/Paper@ea9cd17c Use version fetcher from unsafe values in new version command (#13246) PaperMC/Paper@c68a55ca Optimise CraftWorld#spawnParticle (#13250) PaperMC/Paper@6794db4f Make spawning more accurately track vanilla (#12627) PaperMC/Paper@f55a34fd Properly handle provider plugins in load order (#13242) PaperMC/Paper@e74d7023 Fix HelpMap topic creation for bootstrap commands (#13231) PaperMC/Paper@fcb2956a Add debug logging for entities with invalid ids (#13229) PaperMC/Paper@5fd3c951 Add Entity#teleportAsync(Location, TeleportFlag...) (#13208) PaperMC/Paper@e8c6ba50 Expose JukeboxSong variables (#13214)
This commit is contained in:
@@ -36,7 +36,7 @@ index bf3674f8984dd0ee441e04f92b747f908d629953..132e045f3885146a9a6510c6ed51fcb8
|
||||
+ // Purpur end - Ridables
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
index 00af7ce338ea49375ce1a5e95d01fb24b1c43de8..691c7e393ff6a0d4b132f25b6de2b346b97f7169 100644
|
||||
index d5496e5fbb5fcd65df2933ebc7cb39df7d832923..09ef508247d98645591283d91a9beba90d1df7d5 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -521,6 +521,15 @@ public class CraftEventFactory {
|
||||
@@ -55,7 +55,7 @@ index 00af7ce338ea49375ce1a5e95d01fb24b1c43de8..691c7e393ff6a0d4b132f25b6de2b346
|
||||
return event;
|
||||
}
|
||||
|
||||
@@ -1053,6 +1062,7 @@ public class CraftEventFactory {
|
||||
@@ -1043,6 +1052,7 @@ public class CraftEventFactory {
|
||||
EntityDamageEvent event;
|
||||
if (damager != null) {
|
||||
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical);
|
||||
|
||||
Reference in New Issue
Block a user