mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
SPIGOT-3407: Set damager for evoker fangs
This commit is contained in:
parent
14b597f0c8
commit
50b75cd65d
12
nms-patches/EntityEvokerFangs.patch
Normal file
12
nms-patches/EntityEvokerFangs.patch
Normal file
@ -0,0 +1,12 @@
|
||||
--- a/net/minecraft/server/EntityEvokerFangs.java
|
||||
+++ b/net/minecraft/server/EntityEvokerFangs.java
|
||||
@@ -108,7 +108,9 @@
|
||||
|
||||
if (entityliving.isAlive() && !entityliving.be() && entityliving != entityliving1) {
|
||||
if (entityliving1 == null) {
|
||||
+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = this; // CraftBukkit
|
||||
entityliving.damageEntity(DamageSource.MAGIC, 6.0F);
|
||||
+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; // CraftBukkit
|
||||
} else {
|
||||
if (entityliving1.r(entityliving)) {
|
||||
return;
|
@ -520,6 +520,8 @@ public class CraftEventFactory {
|
||||
cause = DamageCause.FALL;
|
||||
} else if (source == DamageSource.DRAGON_BREATH) {
|
||||
cause = DamageCause.DRAGON_BREATH;
|
||||
} else if (source == DamageSource.MAGIC) {
|
||||
cause = DamageCause.MAGIC;
|
||||
} else {
|
||||
throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.translationIndex));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user