Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issues (#1509)

Browse Source
This commit is contained in:
Krakenied
2024-04-28 22:23:25 +02:00
committed by GitHub
parent 9d2dae3c9c
commit dc9993f4d1
36 changed files with 207 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0269-Milk-Keeps-Beneficial-Effects.patch
View File

@@ -5,14 +5,14 @@ Subject: [PATCH] Milk Keeps Beneficial Effects
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index def30f8c79a4244116f1b9d9ae1a9d06d0a38bce..319e33285b9ba1c65bab9cf2266a15aa0f24d002 100644
index def30f8c79a4244116f1b9d9ae1a9d06d0a38bce..1f0b8e10e03a1c0aea99768d714325effd04861e 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1154,6 +1154,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
for (flag = false; iterator.hasNext(); flag = true) {
// CraftBukkit start
MobEffectInstance effect = (MobEffectInstance) iterator.next();
+ if (cause == EntityPotionEffectEvent.Cause.MILK && !this.level().purpurConfig.milkClearsBeneficialEffects && effect.getEffect().isBeneficial()) continue; // Purpur
+ if (cause == EntityPotionEffectEvent.Cause.MILK && !this.level().purpurConfig.milkClearsBeneficialEffects && effect.getEffect().value().isBeneficial()) continue; // Purpur
EntityPotionEffectEvent event = CraftEventFactory.callEntityPotionEffectChangeEvent(this, effect, null, cause, EntityPotionEffectEvent.Action.CLEARED);
if (event.isCancelled()) {
continue;