JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix setType in DisguiseRabbit causing critical errors on 1.8

This commit is contained in:
Sam 2018-04-01 00:35:21 +01:00 committed by Alexander Meech
parent b1b31f1135
commit 0154c4d1c4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseRabbit.java
View File

@ -26,7 +26,7 @@ public class DisguiseRabbit extends DisguiseAnimal
_type = type; _type = type;
int id = type.ordinal(); int id = type.ordinal();
DataWatcher.watch(18, id, EntityRabbit.META_TYPE, id); DataWatcher.watch(18, (byte) id, EntityRabbit.META_TYPE, id);
} }
public Type getType() public Type getType()

8
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java
View File

@ -109,7 +109,13 @@ public class MorphBunny extends MorphAbilityGadget
if (disguise != null) 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); disguise.setType(newType);
Manager.getDisguiseManager().updateDisguise(disguise); Manager.getDisguiseManager().updateDisguise(disguise);