Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore mypets in listeners

Browse Source
This commit is contained in:
destro174 2022-02-14 10:00:17 +01:00
parent 366cb327a4
commit bf491d649a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -196,6 +196,12 @@
<version>5.7.0</version> <version>5.7.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- MyPet -->
<dependency>
<groupId>de.keyle</groupId>
<artifactId>mypet</artifactId>
<version>3.11-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>
<distributionManagement> <distributionManagement>

3
src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
View File

@ -18,6 +18,7 @@
package me.ryanhamshire.GriefPrevention; package me.ryanhamshire.GriefPrevention;
import de.Keyle.MyPet.api.entity.MyPetBukkitEntity;
import me.ryanhamshire.GriefPrevention.events.PreventPvPEvent; import me.ryanhamshire.GriefPrevention.events.PreventPvPEvent;
import me.ryanhamshire.GriefPrevention.events.ProtectDeathDropsEvent; import me.ryanhamshire.GriefPrevention.events.ProtectDeathDropsEvent;
import org.bukkit.Bukkit; 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) if (damageSource != null && damageSource.getType() == EntityType.FIREWORK && event.getEntity().getType() != EntityType.PLAYER)
return; 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()); GriefPrevention.sendMessage(attacker, TextMode.Err, noContainersReason.get());
} }