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:
97b2eadf1 [Auto] Updated Upstream (CraftBukkit)
4c10f02d6 [Auto] Updated Upstream (Spigot)
8ab9dc066 Add API to get exact interaction point in PlayerInteractEvent (#4995)
0c74328e5 [CI-SKIP] Add a few missing commands to the ./paper help output
This commit is contained in:
BillyGalbreath
2021-01-08 22:23:38 -06:00
parent bf7e290f25
commit 7a6e6ec4ca
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0138-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 3edc530ec688047ae037303442a16e8c5e2e72d4..0d9c4d2a427a3484db1f87476be43c03dd36621d 100644
index 956809378997df0aa7c912106799bfdaaed97a53..9c09d4c2f5b4d34fbf340db5b5bb6b860a25bd08 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1044,7 +1044,7 @@ public class CraftEventFactory {
@@ -1055,7 +1055,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) {