Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 17:07:34 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose

Browse Source
This commit is contained in:
ShaneBee 2020-02-02 11:16:01 +11:00 committed by md_5
parent 0098037647
commit ae45e09223
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nms-patches/BlockWitherRose.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/net/minecraft/server/BlockWitherRose.java
+++ b/net/minecraft/server/BlockWitherRose.java
@@ -20,7 +20,7 @@
EntityLiving entityliving = (EntityLiving) entity;
if (!entityliving.isInvulnerable(DamageSource.WITHER)) {
- entityliving.addEffect(new MobEffect(MobEffects.WITHER, 40));
+ entityliving.addEffect(new MobEffect(MobEffects.WITHER, 40), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.WITHER_ROSE); // CraftBukkit
}
}

8
nms-patches/EntityBee.patch
View File

@ -1,6 +1,12 @@
--- a/net/minecraft/server/EntityBee.java --- a/net/minecraft/server/EntityBee.java
+++ b/net/minecraft/server/EntityBee.java +++ b/net/minecraft/server/EntityBee.java
@@ -157,7 +157,7 @@ @@ -152,12 +152,12 @@
}
if (b0 > 0) {
- ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.POISON, b0 * 20, 0));
+ ((EntityLiving) entity).addEffect(new MobEffect(MobEffects.POISON, b0 * 20, 0), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.ATTACK); // CraftBukkit
}
} }
this.setHasStung(true); this.setHasStung(true);

9
nms-patches/EntityRaider.patch
View File

@ -1,5 +1,14 @@
--- a/net/minecraft/server/EntityRaider.java --- a/net/minecraft/server/EntityRaider.java
+++ b/net/minecraft/server/EntityRaider.java +++ b/net/minecraft/server/EntityRaider.java
@@ -131,7 +131,7 @@
MobEffect mobeffect1 = new MobEffect(MobEffects.BAD_OMEN, 120000, i, false, false, true);
if (!this.world.getGameRules().getBoolean(GameRules.DISABLE_RAIDS)) {
- entityhuman.addEffect(mobeffect1);
+ entityhuman.addEffect(mobeffect1, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN); // CraftBukkit
}
}
}
@@ -397,7 +397,7 @@ @@ -397,7 +397,7 @@
while (iterator.hasNext()) { while (iterator.hasNext()) {
EntityRaider entityraider = (EntityRaider) iterator.next(); EntityRaider entityraider = (EntityRaider) iterator.next();