From e786f4635b253348698cbc8b6bde3816f8228183 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 8 Aug 2015 23:33:19 -0500 Subject: [PATCH] [23:29:51] no tacoz 4 clippeh --- ...urable-strength-and-weakness-effect-modifiers.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Spigot-Server-Patches/0027-Configurable-strength-and-weakness-effect-modifiers.patch b/Spigot-Server-Patches/0027-Configurable-strength-and-weakness-effect-modifiers.patch index c0926037bc..307307e522 100644 --- a/Spigot-Server-Patches/0027-Configurable-strength-and-weakness-effect-modifiers.patch +++ b/Spigot-Server-Patches/0027-Configurable-strength-and-weakness-effect-modifiers.patch @@ -1,11 +1,11 @@ -From dc69eb5cb3b668fcb260ed30bec20449eda75bef Mon Sep 17 00:00:00 2001 +From 2e59ad6e50a369c6e6f6cf1e8282ceaba1cad314 Mon Sep 17 00:00:00 2001 From: gsand Date: Sun, 8 Mar 2015 03:41:33 -0500 Subject: [PATCH] Configurable strength and weakness effect modifiers diff --git a/src/main/java/net/minecraft/server/MobEffectAttackDamage.java b/src/main/java/net/minecraft/server/MobEffectAttackDamage.java -index 620685a..3411b78 100644 +index 620685a..175503b 100644 --- a/src/main/java/net/minecraft/server/MobEffectAttackDamage.java +++ b/src/main/java/net/minecraft/server/MobEffectAttackDamage.java @@ -7,6 +7,7 @@ public class MobEffectAttackDamage extends MobEffectList { @@ -14,11 +14,11 @@ index 620685a..3411b78 100644 public double a(int i, AttributeModifier attributemodifier) { - return this.id == MobEffectList.WEAKNESS.id ? (double) (-0.5F * (float) (i + 1)) : 1.3D * (double) (i + 1); + // PaperSpigot - Configurable modifiers for strength and weakness effects -+ return this.id == MobEffectList.WEAKNESS.id ? (double) (org.github.paperspigot.PaperSpigotConfig.weaknessEffectModifier * (float) (i + 1)) : org.github.paperspigot.PaperSpigotConfig.strengthEffectModifier * (double) i + 1; ++ return this.id == MobEffectList.WEAKNESS.id ? (double) (org.github.paperspigot.PaperSpigotConfig.weaknessEffectModifier * (float) (i + 1)) : org.github.paperspigot.PaperSpigotConfig.strengthEffectModifier * (double) (i + 1); } } diff --git a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java -index 0cd121b..815ad97 100644 +index dd34ced..d982f07 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotConfig.java +++ b/src/main/java/org/github/paperspigot/PaperSpigotConfig.java @@ -164,4 +164,12 @@ public class PaperSpigotConfig @@ -35,5 +35,5 @@ index 0cd121b..815ad97 100644 + } } -- -2.4.1.windows.1 +2.5.0