summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorThinkofname <thinkofdeath@spigotmc.org>2016-03-31 00:00:11 +0100
committerThinkofname <thinkofdeath@spigotmc.org>2016-03-31 00:00:11 +0100
commit9dc467e4c8622032ff668286504dd6ec98caa74d (patch)
tree5df697b8d89085793152c107270358d79c015b36 /nms-patches
parent6e527e5b884902df883eb1a3d594ba4dc5147962 (diff)
downloadcraftbukkit-9dc467e4c8622032ff668286504dd6ec98caa74d.tar
craftbukkit-9dc467e4c8622032ff668286504dd6ec98caa74d.tar.gz
craftbukkit-9dc467e4c8622032ff668286504dd6ec98caa74d.tar.lz
craftbukkit-9dc467e4c8622032ff668286504dd6ec98caa74d.tar.xz
craftbukkit-9dc467e4c8622032ff668286504dd6ec98caa74d.zip
Fix a diff mistake in MobEffectList
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/MobEffectList.patch10
1 files changed, 3 insertions, 7 deletions
diff --git a/nms-patches/MobEffectList.patch b/nms-patches/MobEffectList.patch
index fc9837e1..192ac391 100644
--- a/nms-patches/MobEffectList.patch
+++ b/nms-patches/MobEffectList.patch
@@ -72,14 +72,10 @@
}
}
-@@ -203,7 +219,12 @@
- MobEffectList.REGISTRY.a(23, new MinecraftKey("saturation"), (new InstantMobEffect(false, 16262179)).c("effect.saturation").j());
- MobEffectList.REGISTRY.a(24, new MinecraftKey("glowing"), (new MobEffectList(false, 9740385)).c("effect.glowing").b(4, 2));
+@@ -205,5 +221,10 @@
MobEffectList.REGISTRY.a(25, new MinecraftKey("levitation"), (new MobEffectList(true, 13565951)).c("effect.levitation").b(3, 2));
-- MobEffectList.REGISTRY.a(26, new MinecraftKey("luck"), (new MobEffectList(false, 3381504)).c("effect.luck").b(5, 2).j().a(GenericAttributes.i, "03C3C89D-7037-4B42-869F-B146BCB64D2E", 1.0D, 0));
-- MobEffectList.REGISTRY.a(27, new MinecraftKey("unluck"), (new MobEffectList(true, 12624973)).c("effect.unluck").b(6, 2).a(GenericAttributes.i, "CC5AF142-2BD2-4215-B636-2605AED11727", -1.0D, 0));
-+ MobEffectList.REGISTRY.a(26, new MinecraftKey("luck"), (new MobEffectList(false, 3381504)).c("effect.luck").b(5, 2).j().a(GenericAttributes.h, "03C3C89D-7037-4B42-869F-B146BCB64D2E", 1.0D, 0));
-+ MobEffectList.REGISTRY.a(27, new MinecraftKey("unluck"), (new MobEffectList(true, 12624973)).c("effect.unluck").b(6, 2).a(GenericAttributes.h, "CC5AF142-2BD2-4215-B636-2605AED11727", -1.0D, 0));
+ MobEffectList.REGISTRY.a(26, new MinecraftKey("luck"), (new MobEffectList(false, 3381504)).c("effect.luck").b(5, 2).j().a(GenericAttributes.i, "03C3C89D-7037-4B42-869F-B146BCB64D2E", 1.0D, 0));
+ MobEffectList.REGISTRY.a(27, new MinecraftKey("unluck"), (new MobEffectList(true, 12624973)).c("effect.unluck").b(6, 2).a(GenericAttributes.i, "CC5AF142-2BD2-4215-B636-2605AED11727", -1.0D, 0));
+ // CraftBukkit start
+ for (MobEffectList effect : REGISTRY) {
+ org.bukkit.potion.PotionEffectType.registerPotionEffectType(new org.bukkit.craftbukkit.potion.CraftPotionEffectType(effect));