From 9f5ce127542a8bf6d1b45a199a9ea760b6672b84 Mon Sep 17 00:00:00 2001 From: CJ Miller Date: Thu, 18 Jul 2019 14:15:31 -0700 Subject: [PATCH] Remove OnlyIn Client Distribution from Effect and EffectType methods. (#5925) --- .../net/minecraft/potion/Effect.java.patch | 18 +++++++++++++++++- .../net/minecraft/potion/EffectType.java.patch | 10 ++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 patches/minecraft/net/minecraft/potion/EffectType.java.patch diff --git a/patches/minecraft/net/minecraft/potion/Effect.java.patch b/patches/minecraft/net/minecraft/potion/Effect.java.patch index 799bf104d4..c4e0c12351 100644 --- a/patches/minecraft/net/minecraft/potion/Effect.java.patch +++ b/patches/minecraft/net/minecraft/potion/Effect.java.patch @@ -9,7 +9,15 @@ private final Map field_111188_I = Maps.newHashMap(); private final EffectType field_220305_b; private final int field_76414_N; -@@ -149,7 +149,6 @@ +@@ -134,7 +134,6 @@ + return new TranslationTextComponent(this.func_76393_a()); + } + +- @OnlyIn(Dist.CLIENT) + public EffectType func_220303_e() { + return this.field_220305_b; + } +@@ -149,7 +148,6 @@ return this; } @@ -17,3 +25,11 @@ public Map func_111186_k() { return this.field_111188_I; } +@@ -180,7 +178,6 @@ + return p_111183_2_.func_111164_d() * (double)(p_111183_1_ + 1); + } + +- @OnlyIn(Dist.CLIENT) + public boolean func_188408_i() { + return this.field_220305_b == EffectType.BENEFICIAL; + } diff --git a/patches/minecraft/net/minecraft/potion/EffectType.java.patch b/patches/minecraft/net/minecraft/potion/EffectType.java.patch new file mode 100644 index 0000000000..57fdf84646 --- /dev/null +++ b/patches/minecraft/net/minecraft/potion/EffectType.java.patch @@ -0,0 +1,10 @@ +--- a/net/minecraft/potion/EffectType.java ++++ b/net/minecraft/potion/EffectType.java +@@ -15,7 +15,6 @@ + this.field_220307_d = p_i50390_3_; + } + +- @OnlyIn(Dist.CLIENT) + public TextFormatting func_220306_a() { + return this.field_220307_d; + }