Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 04:55:47 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3407: Set damager for evoker fangs

Browse Source
This commit is contained in:
md_5 2017-07-08 22:40:54 +10:00
parent 14b597f0c8
commit 50b75cd65d
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nms-patches/EntityEvokerFangs.patch Normal file
View 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;

2
src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@ -520,6 +520,8 @@ public class CraftEventFactory {
cause = DamageCause.FALL; cause = DamageCause.FALL;
} else if (source == DamageSource.DRAGON_BREATH) { } else if (source == DamageSource.DRAGON_BREATH) {
cause = DamageCause.DRAGON_BREATH; cause = DamageCause.DRAGON_BREATH;
} else if (source == DamageSource.MAGIC) {
cause = DamageCause.MAGIC;
} else { } else {
throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.translationIndex)); throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.translationIndex));
} }