From 909c1f34d16efdfc76060dbfdc649de5677e1223 Mon Sep 17 00:00:00 2001 From: Warrior <50800980+Warriorrrr@users.noreply.github.com> Date: Sat, 28 Sep 2024 14:03:47 +0200 Subject: [PATCH] Fix cat cotw on older versions --- .../com/gmail/nossr50/skills/taming/TamingManager.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java index 16bab8a433..c7e003f394 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java @@ -402,6 +402,7 @@ private void spawnWolf(Location spawnLocation) { callOfWildEntity.setCustomName(LocaleLoader.getString("Taming.Summon.Name.Format", getPlayer().getName(), StringUtils.getPrettyEntityTypeString(EntityType.WOLF))); } + @SuppressWarnings("deprecation") private void spawnCat(Location spawnLocation, EntityType entityType) { LivingEntity callOfWildEntity = (LivingEntity) getPlayer().getWorld().spawnEntity(spawnLocation, entityType); @@ -414,15 +415,13 @@ private void spawnCat(Location spawnLocation, EntityType entityType) { //Randomize the cat if (callOfWildEntity instanceof Ocelot) { + // Ocelot.Type is deprecated, but that's fine since this only runs on 1.13 int numberOfTypes = Ocelot.Type.values().length; ((Ocelot) callOfWildEntity).setCatType(Ocelot.Type.values()[Misc.getRandom().nextInt(numberOfTypes)]); - ((Ocelot) callOfWildEntity).setAdult(); - } else if (callOfWildEntity instanceof Cat) { - int numberOfTypes = Cat.Type.values().length; - ((Cat) callOfWildEntity).setCatType(Cat.Type.values()[Misc.getRandom().nextInt(numberOfTypes)]); - ((Cat) callOfWildEntity).setAdult(); } + ((Ageable) callOfWildEntity).setAdult(); + callOfWildEntity.setCustomName(LocaleLoader.getString("Taming.Summon.Name.Format", getPlayer().getName(), StringUtils.getPrettyEntityTypeString(entityType))); //Particle effect