Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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

10
patches/server/0109-Ridables.patch
View File

@@ -6383,10 +6383,10 @@ index a6d849facba1526ae2a2b7f3fb9a140d0b50289c..b56ca054b37f5887e13b481baad8132f
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 4534d22aec95cf247daf7575472acd0eba91a3c9..3edc530ec688047ae037303442a16e8c5e2e72d4 100644
index c762015e1402b59bf28dae7f947e7737fbac5c1d..956809378997df0aa7c912106799bfdaaed97a53 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -498,6 +498,18 @@ public class CraftEventFactory {
@@ -509,6 +509,18 @@ public class CraftEventFactory {
}
craftServer.getPluginManager().callEvent(event);
@@ -6405,7 +6405,7 @@ index 4534d22aec95cf247daf7575472acd0eba91a3c9..3edc530ec688047ae037303442a16e8c
return event;
}
@@ -898,6 +910,7 @@ public class CraftEventFactory {
@@ -909,6 +921,7 @@ public class CraftEventFactory {
damageCause = DamageCause.ENTITY_EXPLOSION;
}
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions);
@@ -6413,7 +6413,7 @@ index 4534d22aec95cf247daf7575472acd0eba91a3c9..3edc530ec688047ae037303442a16e8c
}
event.setCancelled(cancelled);
@@ -982,6 +995,7 @@ public class CraftEventFactory {
@@ -993,6 +1006,7 @@ public class CraftEventFactory {
if (!event.isCancelled()) {
event.getEntity().setLastDamageCause(event);
}
@@ -6421,7 +6421,7 @@ index 4534d22aec95cf247daf7575472acd0eba91a3c9..3edc530ec688047ae037303442a16e8c
return event;
}
@@ -1031,6 +1045,7 @@ public class CraftEventFactory {
@@ -1042,6 +1056,7 @@ public class CraftEventFactory {
EntityDamageEvent event;
if (damager != null) {
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);