From 0154c4d1c4321f6df5f77b19189568a3288fff35 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 1 Apr 2018 00:35:21 +0100 Subject: [PATCH] Fix setType in DisguiseRabbit causing critical errors on 1.8 --- .../mineplex/core/disguise/disguises/DisguiseRabbit.java | 2 +- .../mineplex/core/gadget/gadgets/morph/MorphBunny.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseRabbit.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseRabbit.java index 0890effe6..f41c8b3c7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseRabbit.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseRabbit.java @@ -26,7 +26,7 @@ public class DisguiseRabbit extends DisguiseAnimal _type = type; int id = type.ordinal(); - DataWatcher.watch(18, id, EntityRabbit.META_TYPE, id); + DataWatcher.watch(18, (byte) id, EntityRabbit.META_TYPE, id); } public Type getType() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java index 53703fcfe..7eed06e46 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java @@ -109,7 +109,13 @@ public class MorphBunny extends MorphAbilityGadget if (disguise != null) { - Rabbit.Type newType = Rabbit.Type.values()[(disguise.getType().ordinal() + 1) % Rabbit.Type.values().length - 1]; + Rabbit.Type newType = Rabbit.Type.values()[(disguise.getType().ordinal() + 1) % Rabbit.Type.values().length]; + + if (newType == Rabbit.Type.THE_KILLER_BUNNY) + { + newType = Rabbit.Type.BROWN; + } + disguise.setType(newType); Manager.getDisguiseManager().updateDisguise(disguise);