YouHaveTrouble/PreventStabby
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/PreventStabby.git synced 2026-05-11 21:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

tempting horses should not cause player to enter combat

Browse Source
This commit is contained in:
youhavetrouble
2023-05-03 21:26:38 +02:00
parent b3ce1913fd
commit ac1cafe0d9
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/youhavetrouble/preventstabby/listeners/pets/PetTargettingPlayerListener.java
+8 -2
View File
@@ -8,6 +8,7 @@ import org.bukkit.entity.Tameable;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityTargetEvent;
import java.util.UUID; import java.util.UUID;
@@ -17,7 +18,7 @@ public class PetTargettingPlayerListener implements Listener {
* Stops pets with owners targetting players with pvp off * Stops pets with owners targetting players with pvp off
*/ */
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPetTargetPlayer(org.bukkit.event.entity.EntityTargetEvent event) { public void onPetTargetPlayer(EntityTargetEvent event) {
if (!(event.getEntity() instanceof Tameable)) return; if (!(event.getEntity() instanceof Tameable)) return;
Tameable entity = (Tameable) event.getEntity(); Tameable entity = (Tameable) event.getEntity();
if (!(entity.getOwner() instanceof Player)) return; if (!(entity.getOwner() instanceof Player)) return;
@@ -26,8 +27,13 @@ public class PetTargettingPlayerListener implements Listener {
UUID damager = entity.getOwner().getUniqueId(); UUID damager = entity.getOwner().getUniqueId();
UUID victim = event.getTarget().getUniqueId(); UUID victim = event.getTarget().getUniqueId();
if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false)) if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false)) {
if (event.getReason().equals(EntityTargetEvent.TargetReason.TEMPT)) {
event.setCancelled(true);
return;
}
CombatTimer.refreshPlayersCombatTime(damager, victim); CombatTimer.refreshPlayersCombatTime(damager, victim);
}
else else
event.setCancelled(true); event.setCancelled(true);