Skip to content

feat: Cure effects food property #1146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RealRONiN wants to merge 7 commits into from
+159 −0
Closed

feat: Cure effects food property #1146

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c27e67a
feat: honey bottle cures and heals
RealRONiN Oct 6, 2022
95127da
refactor: cure effects food property
RealRONiN Oct 8, 2022
4e45b8d
refactor: moved Paper's honey bottle cure poison to default food prop…
RealRONiN Oct 8, 2022
be73255
revert: reverted some formattings and auto-imports
RealRONiN Oct 10, 2022
174d563
Merge branch 'ver/1.19.2' into RealRONiN/ver/1.19.2
granny Oct 25, 2022
c239491
rebase
granny Oct 25, 2022
1b640b4
deep clean patch
granny Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rebase
  • Loading branch information
@granny
granny committed Oct 25, 2022
commit c239491914ea6485ada96943ea2c5b6c694d1c26
18 changes: 9 additions & 9 deletions ...ver/0309-Cure-effects-food-property.patch → ...ver/0313-Cure-effects-food-property.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ Subject: [PATCH] Cure effects food property


diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 9dca0d694aa8fa7f8bec0d2504986085e0cc6fe9..16c722acbbb0e7cd66d035919649ef623fc81ece 100644
index 1ec9a48f2f44f5bd647e0661423ae90970aee262..86c6221229ce8e8880b4641279c360132d56bee0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -4374,6 +4374,7 @@ public abstract class LivingEntity extends Entity {
@@ -4373,6 +4373,7 @@ public abstract class LivingEntity extends Entity {
if (stack.isEdible()) {
world.playSound((net.minecraft.world.entity.player.Player) null, this.getX(), this.getY(), this.getZ(), this.getEatingSound(stack), SoundSource.NEUTRAL, 1.0F, 1.0F + (world.random.nextFloat() - world.random.nextFloat()) * 0.4F);
this.addEatEffect(stack, world, this);
+ this.removeEatEffect(stack, world, this); //Purpur
if (!(this instanceof net.minecraft.world.entity.player.Player) || !((net.minecraft.world.entity.player.Player) this).getAbilities().instabuild) {
stack.shrink(1);
}
@@ -4388,7 +4389,7 @@ public abstract class LivingEntity extends Entity {
@@ -4387,7 +4388,7 @@ public abstract class LivingEntity extends Entity {
Item item = stack.getItem();

if (item.isEdible()) {
Expand All @@ -25,7 +25,7 @@ index 9dca0d694aa8fa7f8bec0d2504986085e0cc6fe9..16c722acbbb0e7cd66d035919649ef62
Iterator iterator = list.iterator();

while (iterator.hasNext()) {
@@ -4402,6 +4403,23 @@ public abstract class LivingEntity extends Entity {
@@ -4401,6 +4402,23 @@ public abstract class LivingEntity extends Entity {

}

Expand Down Expand Up @@ -212,7 +212,7 @@ index c8d6b5e60b6c8c612fa8580c63a32c4a8f8b0a7b..47fd71af71003ab0f8d16cac039f955f
if (stack.isEmpty()) {
return new ItemStack(Items.GLASS_BOTTLE);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 3cfbb4300e82cce409a7a0b53ef98987f166143c..dd6e3c74e89860d63813f5ca65de623928be9f96 100644
index ccca392a45cb05abb55ddd5c6c36e6f9c7a5d171..2cbc9870cba725ef45bbfc2d1e21f99190259376 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -24,7 +24,6 @@ import org.bukkit.configuration.InvalidConfigurationException;
Expand All @@ -223,7 +223,7 @@ index 3cfbb4300e82cce409a7a0b53ef98987f166143c..dd6e3c74e89860d63813f5ca65de6239
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -535,10 +534,10 @@ public class PurpurConfig {
@@ -540,10 +539,10 @@ public class PurpurConfig {
food.setIsMeat(properties.getBoolean(foodKey + ".is-meat", foodDefaults.isMeat()));
food.setCanAlwaysEat(properties.getBoolean(foodKey + ".can-always-eat", foodDefaults.canAlwaysEat()));
food.setFastFood(properties.getBoolean(foodKey + ".fast-food", foodDefaults.isFastFood()));
Expand All @@ -237,7 +237,7 @@ index 3cfbb4300e82cce409a7a0b53ef98987f166143c..dd6e3c74e89860d63813f5ca65de6239
effectDefaults.put("chance", pair.getSecond());
MobEffectInstance effect = pair.getFirst();
effectDefaults.put("duration", effect.getDuration());
@@ -547,25 +546,37 @@ public class PurpurConfig {
@@ -552,25 +551,37 @@ public class PurpurConfig {
effectDefaults.put("visible", effect.isVisible());
effectDefaults.put("show-icon", effect.showIcon());
});
Expand Down Expand Up @@ -285,7 +285,7 @@ index 3cfbb4300e82cce409a7a0b53ef98987f166143c..dd6e3c74e89860d63813f5ca65de6239
}

diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a6356d19f0fc664be523f19c2ea1704191a7a73a..1912bc126767928a9cf51ca638f9be340b0dd327 100644
index c7f0fba9d3d5415e7965501774feaf12d7b1b3a6..98042ab4088dd9f892986ebd8ebea82ac61f67c8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -29,6 +29,7 @@ import java.util.Locale;
Expand All @@ -296,7 +296,7 @@ index a6356d19f0fc664be523f19c2ea1704191a7a73a..1912bc126767928a9cf51ca638f9be34
import static org.purpurmc.purpur.PurpurConfig.log;

@SuppressWarnings("unused")
@@ -3132,4 +3133,3 @@ public class PurpurWorldConfig {
@@ -3138,4 +3139,3 @@ public class PurpurWorldConfig {
cauldronDripstoneLavaFillChance = (float) getDouble("blocks.cauldron.fill-chances.dripstone-lava", cauldronDripstoneLavaFillChance);
}
}
Expand Down