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:
020f18aaa6 fix: promote slf4j-api to api scope (#6343)
c815948b6d Fix ITEM_DROPPED stat not working properly (#6331)
9a125eecb8 Fix Incorrectly Typed Goals (#6200)
23e3a0ccb6 Add PlayerSetSpawnEvent (#5690)
00028d57cf call EntityDamageByBlockEvent for campfires (#6244)
9b4a46f704 [ci skip] add vs code files to .gitignore (#5663)
a178fb895e Make hoppers respect inventory max stack size (#4838)
4a2f53c6e8 Add missing DamageCause for EntityDamageByBlockEvent (#6352)
f261419fd5 clone itemstack to return remaining stack (#6353)
This commit is contained in:
William Blake Galbreath
2021-08-07 19:10:45 -05:00
parent 661cc4bd82
commit b0f215162b
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
View File

@@ -33,7 +33,7 @@ index 3e04510519ca5d03eb16aab8b1094e24101cebf4..12a3304c3b465f2a9d7cf279ea7b945b
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 5338d1638988c6fdd855eb9acf4fb7f6d4eaa498..7f38e0ea4de15486cd96cd1f5ae0b4f41a91a06f 100644
index 98e0c1e64d23552b8e8de5e17cee09fc0cb08d5c..5608ee1125c41d055e2827ab8a801e704ebb0441 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -967,7 +967,7 @@ public class CraftEventFactory {
@@ -45,7 +45,7 @@ index 5338d1638988c6fdd855eb9acf4fb7f6d4eaa498..7f38e0ea4de15486cd96cd1f5ae0b4f4
damager.processClick(InteractionHand.MAIN_HAND); // Purpur
}
event.setCancelled(cancelled);
@@ -1046,7 +1046,7 @@ public class CraftEventFactory {
@@ -1050,7 +1050,7 @@ public class CraftEventFactory {
} else {
throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.msgId));
}
@@ -54,7 +54,7 @@ index 5338d1638988c6fdd855eb9acf4fb7f6d4eaa498..7f38e0ea4de15486cd96cd1f5ae0b4f4
event.setCancelled(cancelled);
CraftEventFactory.callEvent(event);
if (!event.isCancelled()) {
@@ -1103,7 +1103,7 @@ public class CraftEventFactory {
@@ -1107,7 +1107,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) {