diff --git a/Plugin/build.gradle b/Plugin/build.gradle index f4dda154..131ada2b 100644 --- a/Plugin/build.gradle +++ b/Plugin/build.gradle @@ -29,7 +29,7 @@ dependencies { compileOnly 'net.citizensnpcs:citizens:2.0.27' compileOnly 'com.nisovin:shopkeepers:2.11.0' compileOnly 'com.magmaguy:elitemobs:7.2.16' - compileOnly 'de.keyle:mypet:3.14.0' + compileOnly 'de.keyle:mypet-api:4.0.1' compileOnly 'io.lumine:Mythic-Dist:5.3.3' compileOnly ('com.gmail.nossr50.mcMMO:mcMMO:2.2.012') { exclude group: 'com.comphenix.protocol' diff --git a/Plugin/src/main/java/dev/rosewood/rosestacker/hook/NPCsHook.java b/Plugin/src/main/java/dev/rosewood/rosestacker/hook/NPCsHook.java index 7c1b107f..98e7ba8e 100644 --- a/Plugin/src/main/java/dev/rosewood/rosestacker/hook/NPCsHook.java +++ b/Plugin/src/main/java/dev/rosewood/rosestacker/hook/NPCsHook.java @@ -3,7 +3,7 @@ import com.magmaguy.elitemobs.entitytracker.EntityTracker; import com.nisovin.shopkeepers.api.ShopkeepersAPI; import com.songoda.epicbosses.EpicBosses; -import de.Keyle.MyPet.api.entity.MyPetBukkitEntity; +import de.Keyle.MyPet.MyPetApi; import dev.rosewood.rosegarden.utils.StringPlaceholders; import dev.rosewood.rosestacker.config.SettingKey; import io.hotmail.com.jacob_vejvoda.infernal_mobs.infernal_mobs; @@ -223,8 +223,8 @@ public static boolean isNPC(LivingEntity entity) { if (!npc && villagerMarketEnabled()) npc = VillagerMarketAPI.getShopManager().isShop(entity); - if (!npc && mypetEnabled()) - npc = entity instanceof MyPetBukkitEntity; + if (!npc && mypetEnabled() && MyPetApi.isReady()) + npc = MyPetApi.getPetManager().getPetFromEntity(entity) != null; return npc; } diff --git a/build.gradle b/build.gradle index 7ec09e4d..984fb572 100644 --- a/build.gradle +++ b/build.gradle @@ -40,6 +40,7 @@ allprojects { maven { url = 'https://mvn.lumine.io/repository/maven-public/' } maven { url = 'https://maven.playpro.com' } maven { url = 'https://repo.bsdevelopment.org/releases' } + maven { url = 'https://repo.userderezzed.dev/releases' } maven { url = 'https://nexus.neetgames.com/repository/maven-releases/' } maven { url = 'https://jitpack.io' }