Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
8ccb7fd67 Add and implement cancellable TargetHitEvent for when Target Blocks are hit by Projectiles
0507b5d7f [Auto] Updated Upstream (CraftBukkit)
1c2571224 [CI-SKIP] [Auto] Rebuild Patches
2b312dfbe Add OBSTRUCTED result to BedEnterResult enum
a5201ac98 [CI-SKIP] [Auto] Rebuild Patches
fb7503399 added PlayerTradeEvent
This commit is contained in:
jmp
2020-12-29 11:49:13 -08:00
parent 77373ea42e
commit 7194a1684a
12 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0139-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
View File

@@ -33,10 +33,10 @@ index 9963cef9298eb6d3e2ee6a24d9b1998e765123ac..a72ce4ea5a45fce35a47fd5f9c21b950
if (flag5) {
if (i > 0) {
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index a17f449b543d2ab4191b6397835856e1a7d664e3..110db570c8c917e6b9eeab534e47ce9135ad09c9 100644
index 182e3258cdce99139c229e99cfbc54f23b7dfa77..eec1e49f615f8491b28b6a921c192ffae803b478 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1048,7 +1048,7 @@ public class CraftEventFactory {
@@ -1052,7 +1052,7 @@ public class CraftEventFactory {
private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
EntityDamageEvent event;
if (damager != null) {