Skip to content

Support MyPet 4 #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UserDerezzed wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

Support MyPet 4 #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions Plugin/src/main/java/dev/rosewood/rosestacker/hook/NPCsHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }

Expand Down