mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
Reorder bukkit damage source entity for explosion (#8553)
This commit is contained in:
parent
a81c97eafe
commit
72369d4f40
1 changed files with 32 additions and 0 deletions
|
@ -0,0 +1,32 @@
|
||||||
|
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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/world/level/Explosion.java
|
||||||
|
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
|
||||||
|
@@ -0,0 +0,0 @@ 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:
|
||||||
|
@@ -0,0 +0,0 @@ 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)) {
|
Loading…
Reference in a new issue