mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-21 02:38:16 +02:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1a332f7e move age locked related methods to Ageable and normalize setBaby/Adult setters PaperMC/Paper@8b644429 fix chorus plant not growing properly PaperMC/Paper@d45004bd deprecate group methods for some recipes PaperMC/Paper@006f9d1b use the right var in ItemStack#useOn PaperMC/Paper@f66c5901 remove redundant setBlock for cauldrons PaperMC/Paper@c2631139 simplify cauldron events PaperMC/Paper@33a9258c merge PlayerInteractAtEntityEvent and PlayerInteractEntityEvent PaperMC/Paper@2d6e82ec Change world storage layout to be closer to vanilla & implement migration (#13736) PaperMC/Paper@16e0088d Update Moonrise and DC PaperMC/Paper@c7532535 Delete rej patches for applied files PaperMC/Paper@e0497a6e Fix Moonrise compile
This commit is contained in:
@@ -36,10 +36,10 @@ index c5a866735d7d918ea58306ea2299a8b82be52f3f..d6ddbcff911ce4c97a20883af10d2b47
|
||||
+ // 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 1651f3cc24120acffb073c2b736fbd410358f630..60bc33303bc2084ff13634d0997b6d811611433d 100644
|
||||
index 8321fcec2344a67d59948b552cc1415b1166a920..370feb75737fd7a72445c9f51b6689959af63c35 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -646,6 +646,15 @@ public class CraftEventFactory {
|
||||
@@ -647,6 +647,15 @@ public class CraftEventFactory {
|
||||
}
|
||||
craftServer.getPluginManager().callEvent(event);
|
||||
|
||||
@@ -55,7 +55,7 @@ index 1651f3cc24120acffb073c2b736fbd410358f630..60bc33303bc2084ff13634d0997b6d81
|
||||
return event;
|
||||
}
|
||||
|
||||
@@ -1158,6 +1167,7 @@ public class CraftEventFactory {
|
||||
@@ -1159,6 +1168,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