mirror of
https://github.com/YouHaveTrouble/PreventStabby.git
synced 2026-05-12 13:26:56 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7f1da79444 | |||
| 244ceb4dcc | |||
| ac1cafe0d9 |
@@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>me.youhavetrouble</groupId>
|
||||
<artifactId>PreventStabby</artifactId>
|
||||
<version>1.10.0</version>
|
||||
<version>1.10.1</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>PreventStabby</name>
|
||||
|
||||
+10
-2
@@ -8,6 +8,7 @@ import org.bukkit.entity.Tameable;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.EntityTargetEvent;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
@@ -17,7 +18,7 @@ public class PetTargettingPlayerListener implements Listener {
|
||||
* Stops pets with owners targetting players with pvp off
|
||||
*/
|
||||
@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;
|
||||
Tameable entity = (Tameable) event.getEntity();
|
||||
if (!(entity.getOwner() instanceof Player)) return;
|
||||
@@ -26,8 +27,15 @@ public class PetTargettingPlayerListener implements Listener {
|
||||
UUID damager = entity.getOwner().getUniqueId();
|
||||
UUID victim = event.getTarget().getUniqueId();
|
||||
|
||||
if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, true, false))
|
||||
boolean tempting = event.getReason().equals(EntityTargetEvent.TargetReason.TEMPT);
|
||||
|
||||
if (PreventStabby.getPlugin().getPlayerManager().canDamage(damager, victim, !tempting, false)) {
|
||||
if (tempting) {
|
||||
event.setCancelled(true);
|
||||
return;
|
||||
}
|
||||
CombatTimer.refreshPlayersCombatTime(damager, victim);
|
||||
}
|
||||
else
|
||||
event.setCancelled(true);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user