Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@128691a Deprecate log4j logger method in `Plugin`
PaperMC/Paper@2a306f5 Add Multi Block Change API (#7333)
PaperMC/Paper@feb72b8 Update ASM EventExecutor generator patch to respect event handler return types. Fixes #7311 (#7317)
PaperMC/Paper@dcca6cb Make tag presets unmodifiable (#7378)
PaperMC/Paper@60e46ab Fix NotePlayEvent (#5180)
PaperMC/Paper@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
PaperMC/Paper@9a19308 Lock Frozen Ticks API (#7207)
PaperMC/Paper@a058ac0 Dolphin API (#7102)
PaperMC/Paper@f6c7d53 Add configurable stronghold seed (#7334)
PaperMC/Paper@7978121 More PotionEffectType API (#5737)
PaperMC/Paper@9490475 Add STRUCTURE_TYPE registry entry (#6400)
PaperMC/Paper@b164899 Update tiny-remapper
PaperMC/Paper@f7dbd06 [ci skip] Update parameter mappings
PaperMC/Paper@ca523ab [ci skip] Fix param mismatch from last commit
PaperMC/Paper@2e99e5e Updated Upstream (Bukkit/CraftBukkit) (#7411)
PaperMC/Paper@41263d9 [ci skip] Update paperweight to 1.3.4
PaperMC/Paper@3109dd8 Updated Upstream (Bukkit/CraftBukkit) (#7428)
PaperMC/Paper@17eb884 Use a CHM for StructureTemplate.Pallete cache
PaperMC/Paper@f79c0da Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@2121aed Rebuild patches
PaperMC/Paper@2ec04e0 Use correct headerLocation for regionfile initialisation
PaperMC/Paper@f23c039 Fix infinite recursion in spawnCategoryForChunk/Position
PaperMC/Paper@9940bca API for creating command sender which forwards feedback (#7432)
PaperMC/Paper@46ed080 fix portal linking in upgraded chunks (fixes #7419) (#7438)
PaperMC/Paper@6df4641 Use destination world when preloading spawn chunk (#7441)
PaperMC/Paper@0cc2503 Implement World#regenerateChunk (#7425)
PaperMC/Paper@00da098 Log exceptions thrown during chat processing (#7467)
PaperMC/Paper@26734e8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7454)
PaperMC/Paper@4a745f9 Optimize Util#sequence (#7115)
PaperMC/Paper@2c8d48c Make Panda implement Sittable (#7414)
PaperMC/Paper@2c4a589 Fix issues with LimitedRegion (#7343)
PaperMC/Paper@3d91eca Fix cancelled snow bucket placement (#6751)
PaperMC/Paper@9567753 Don't load plugins prefixed with a dot (#7392)
PaperMC/Paper@92c777d Fix PlayerProfile BukkitObject serialization, deprecate setName and setId for removal (#7471)
PaperMC/Paper@e6898ff Fix IllegalArgumentException for /paper mobcaps command (#7472)
PaperMC/Paper@a8f2d67 - properly fix IllegalArgumentException in `/paper mobcaps` command
This commit is contained in:
lexikiq
2022-02-14 15:22:04 -05:00
parent 0234906175
commit e703b60287
13 changed files with 93 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch
View File

@@ -146,10 +146,10 @@ index 86692a83fb9acd3a501da58e6d509865b49931fe..438ea548644aa9570a09fa4d4a06bde5
public static boolean canSetSpawn(Level world) {
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index d479d3f0228af7fa91056e4ef17a09f6c4ad9d73..176ff59f7639b241a4eac09c00066ee3d4a9fc0b 100644
index d2a1368eeff0704760432166e0910343512bbe4f..11ed21fb283a3ce80efd1d8a0ad027c47242ebc8 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -961,7 +961,7 @@ public class CraftEventFactory {
@@ -971,7 +971,7 @@ public class CraftEventFactory {
CraftEventFactory.entityDamage = null;
EntityDamageEvent event;
if (damager == null) {
@@ -158,7 +158,7 @@ index d479d3f0228af7fa91056e4ef17a09f6c4ad9d73..176ff59f7639b241a4eac09c00066ee3
} else if (entity instanceof EnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) {
event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions);
} else {
@@ -999,7 +999,7 @@ public class CraftEventFactory {
@@ -1009,7 +1009,7 @@ public class CraftEventFactory {
return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
} else if (source == DamageSource.OUT_OF_WORLD) {
@@ -167,12 +167,12 @@ index d479d3f0228af7fa91056e4ef17a09f6c4ad9d73..176ff59f7639b241a4eac09c00066ee3
event.setCancelled(cancelled);
CraftEventFactory.callEvent(event);
if (!event.isCancelled()) {
@@ -1009,7 +1009,7 @@ public class CraftEventFactory {
@@ -1019,7 +1019,7 @@ public class CraftEventFactory {
}
return event;
} else if (source == DamageSource.LAVA) {
- EntityDamageEvent event = (new EntityDamageByBlockEvent(CraftEventFactory.blockDamage, entity.getBukkitEntity(), DamageCause.LAVA, modifiers, modifierFunctions));
+ EntityDamageEvent event = (new EntityDamageByBlockEvent(CraftEventFactory.blockDamage, entity.getBukkitEntity(), DamageCause.LAVA, entity.getBukkitEntity().getLocation().toBlockLocation(), modifiers, modifierFunctions)); // Parchment - add location
event.setCancelled(cancelled);
CraftEventFactory.callEvent(event);
if (!event.isCancelled()) {
Block damager = CraftEventFactory.blockDamage;