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

Update upstream

Browse Source
This commit is contained in:
lexikiq
2021-09-03 00:52:05 -04:00
parent 28a4865c2b
commit 1414569da4
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,10 +146,10 @@ index 88439b8f82a97a9763dadfc6c9dbaf0912ab3eb7..73a9b765b58bb547712c014c8b908653
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 edaebb2566a414718d0910d4306c3b53e061814c..3d4ff819bb46b346cb84844c68a9e963cf4b0890 100644
index b39b05c7f6bd83f39a76c71735cfdee0f46339ba..d70a223533210fe582ee8b05dd2dd3e3763ba14c 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -950,7 +950,7 @@ public class CraftEventFactory {
@@ -954,7 +954,7 @@ public class CraftEventFactory {
CraftEventFactory.entityDamage = null;
EntityDamageEvent event;
if (damager == null) {
@@ -158,7 +158,7 @@ index edaebb2566a414718d0910d4306c3b53e061814c..3d4ff819bb46b346cb84844c68a9e963
} else if (entity instanceof EnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) {
event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions);
} else {
@@ -986,7 +986,7 @@ public class CraftEventFactory {
@@ -990,7 +990,7 @@ public class CraftEventFactory {
return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled);
} else if (source == DamageSource.OUT_OF_WORLD) {
@@ -167,7 +167,7 @@ index edaebb2566a414718d0910d4306c3b53e061814c..3d4ff819bb46b346cb84844c68a9e963
event.setCancelled(cancelled);
CraftEventFactory.callEvent(event);
if (!event.isCancelled()) {
@@ -994,7 +994,7 @@ public class CraftEventFactory {
@@ -998,7 +998,7 @@ public class CraftEventFactory {
}
return event;
} else if (source == DamageSource.LAVA) {