mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-29 23:09:33 +01:00
d5f1ffc2e6
With the new chunk system it doesn't hurt too much to (temporarily) remove this until implemented in a safer manner
33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
|
|
Date: Fri, 11 Nov 2022 11:49:40 +0100
|
|
Subject: [PATCH] Reorder bukkit damage source entity for explosion to exclude
|
|
enderdragon part
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
|
|
index 446b0e74c406d3d57268d8332ea4c29a4dd5f9eb..e7ce14ab0732034107e735787354a6fb0ec90f54 100644
|
|
--- a/src/main/java/net/minecraft/world/level/Explosion.java
|
|
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
|
|
@@ -235,8 +235,6 @@ public class Explosion {
|
|
double d13 = (1.0D - d7) * d12;
|
|
|
|
// CraftBukkit start
|
|
- CraftEventFactory.entityDamage = this.source;
|
|
- entity.lastDamageCancelled = false;
|
|
|
|
// Special case ender dragon only give knockback if no damage is cancelled
|
|
// Thinks to note:
|
|
@@ -248,6 +246,11 @@ public class Explosion {
|
|
continue;
|
|
}
|
|
|
|
+ // Paper start - moved from above
|
|
+ CraftEventFactory.entityDamage = this.source;
|
|
+ entity.lastDamageCancelled = false;
|
|
+ // Paper end
|
|
+
|
|
if (entity instanceof EnderDragon) {
|
|
for (EnderDragonPart entityComplexPart : ((EnderDragon) entity).subEntities) {
|
|
if (list.contains(entityComplexPart)) {
|