From bf491d649a1c270aa5124fb1472afbe8aa22e8e7 Mon Sep 17 00:00:00 2001
From: destro174 <40720638+destro174@users.noreply.github.com>
Date: Mon, 14 Feb 2022 10:00:17 +0100
Subject: [PATCH] Ignore mypets in listeners

---
 pom.xml                                                     | 6 ++++++
 .../me/ryanhamshire/GriefPrevention/EntityEventHandler.java | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6117602..6e46c24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,6 +196,12 @@
             <version>5.7.0</version>
             <scope>test</scope>
         </dependency>
+        <!-- MyPet -->
+        <dependency>
+            <groupId>de.keyle</groupId>
+            <artifactId>mypet</artifactId>
+            <version>3.11-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <distributionManagement>
diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
index 5b92b32..2bc46e6 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
@@ -18,6 +18,7 @@
 
 package me.ryanhamshire.GriefPrevention;
 
+import de.Keyle.MyPet.api.entity.MyPetBukkitEntity;
 import me.ryanhamshire.GriefPrevention.events.PreventPvPEvent;
 import me.ryanhamshire.GriefPrevention.events.ProtectDeathDropsEvent;
 import org.bukkit.Bukkit;
@@ -1235,7 +1236,7 @@ public class EntityEventHandler implements Listener
                             if (damageSource != null && damageSource.getType() == EntityType.FIREWORK && event.getEntity().getType() != EntityType.PLAYER)
                                 return;
 
-                            if (sendErrorMessagesToPlayers)
+                            if (sendErrorMessagesToPlayers && !(event.getEntity() instanceof MyPetBukkitEntity)) // don't send the error message if it's a mypet
                             {
                                 GriefPrevention.sendMessage(attacker, TextMode.Err, noContainersReason.get());
                             }