Update to 1.21

This commit is contained in:
Heliosares
2024-07-17 21:14:05 -04:00
parent 724e443016
commit d266444c7d
4 changed files with 12 additions and 9 deletions

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>AuxProtect</groupId>
<artifactId>AuxProtect</artifactId>
<version>1.3</version>
<version>1.3.1</version>
<name>AuxProtect</name>
<build>
<finalName>${project.artifactId}-${project.version}</finalName>
@@ -160,20 +160,20 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.20.4-R0.1-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.20-R0.1-SNAPSHOT</version>
<version>1.21-R0.1-SNAPSHOT</version>
<type>javadoc</type>
<scope>provided</scope>
</dependency>

View File

@@ -27,8 +27,10 @@ import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityDismountEvent;
import org.bukkit.event.entity.EntityDropItemEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntityMountEvent;
import org.bukkit.event.entity.EntityPickupItemEvent;
import org.bukkit.event.entity.EntityResurrectEvent;
import org.bukkit.event.entity.EntityTameEvent;
@@ -42,8 +44,6 @@ import org.bukkit.inventory.meta.MapMeta;
import org.bukkit.map.MapRenderer;
import org.bukkit.projectiles.ProjectileSource;
import org.bukkit.scheduler.BukkitRunnable;
import org.spigotmc.event.entity.EntityDismountEvent;
import org.spigotmc.event.entity.EntityMountEvent;
import java.util.ArrayList;

View File

@@ -354,7 +354,7 @@ public class PlayerListener implements Listener {
return;
}
boolean tether = entity.getLeashHolder().getType() == EntityType.LEASH_HITCH;
boolean tether = entity.getLeashHolder().getType().toString().startsWith("LEASH_");
DbEntry entry = new DbEntry(AuxProtectSpigot.getLabel(e.getPlayer()), EntryAction.LEASH, false,
e.getEntity().getLocation(), AuxProtectSpigot.getLabel(e.getEntity()), tether ? "was tethered" : "");

View File

@@ -29,11 +29,14 @@ public class ProjectileListener implements Listener {
this.whitelist = new ArrayList<>();
whitelist.add(EntityType.ENDER_PEARL);
whitelist.add(EntityType.TRIDENT);
whitelist.add(EntityType.FISHING_HOOK);
whitelist.add(EntityType.SNOWBALL);
whitelist.add(EntityType.EGG);
whitelist.add(EntityType.SPLASH_POTION);
whitelist.add(EntityType.ARROW);
for (EntityType type : EntityType.values()) {
if (type.toString().contains("POTION") || type.toString().contains("FISHING_")) {
whitelist.add(type);
}
}
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)