chore: Bump dependency versions ans spigot to 1.21

This commit is contained in:
Ammo
2024-07-04 18:16:14 +02:00
parent 5fe6074150
commit dc17b2ad08
4 changed files with 14 additions and 14 deletions

18
pom.xml
View File

@@ -160,13 +160,13 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.20.4-R0.1-SNAPSHOT</version> <version>1.21-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.md-5</groupId> <groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId> <artifactId>bungeecord-api</artifactId>
<version>1.20-R0.1-SNAPSHOT</version> <version>1.21-R0.1-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -180,12 +180,12 @@
<dependency> <dependency>
<groupId>org.xerial</groupId> <groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId> <artifactId>sqlite-jdbc</artifactId>
<version>3.42.0.0</version> <version>3.46.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>20230227</version> <version>20240303</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.acrobot.chestshop</groupId> <groupId>com.acrobot.chestshop</groupId>
@@ -196,7 +196,7 @@
<dependency> <dependency>
<groupId>net.coreprotect</groupId> <groupId>net.coreprotect</groupId>
<artifactId>coreprotect</artifactId> <artifactId>coreprotect</artifactId>
<version>21.3</version> <version>22.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -213,12 +213,12 @@
<dependency> <dependency>
<groupId>com.github.Gypopo</groupId> <groupId>com.github.Gypopo</groupId>
<artifactId>EconomyShopGUI-API</artifactId> <artifactId>EconomyShopGUI-API</artifactId>
<version>1.5.0</version> <version>1.7.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.7sat</groupId> <groupId>com.github.7sat</groupId>
<artifactId>DynamicShop3</artifactId> <artifactId>DynamicShop3</artifactId>
<version>3.15.1</version> <version>3.16.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -230,13 +230,13 @@
<dependency> <dependency>
<groupId>net.essentialsx</groupId> <groupId>net.essentialsx</groupId>
<artifactId>EssentialsX</artifactId> <artifactId>EssentialsX</artifactId>
<version>2.19.7</version> <version>2.20.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.palmergames.bukkit.towny</groupId> <groupId>com.palmergames.bukkit.towny</groupId>
<artifactId>towny</artifactId> <artifactId>towny</artifactId>
<version>0.100.0.0</version> <version>0.100.3.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

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

View File

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

View File

@@ -29,10 +29,10 @@ public class ProjectileListener implements Listener {
this.whitelist = new ArrayList<>(); this.whitelist = new ArrayList<>();
whitelist.add(EntityType.ENDER_PEARL); whitelist.add(EntityType.ENDER_PEARL);
whitelist.add(EntityType.TRIDENT); whitelist.add(EntityType.TRIDENT);
whitelist.add(EntityType.FISHING_HOOK); whitelist.add(EntityType.FISHING_BOBBER);
whitelist.add(EntityType.SNOWBALL); whitelist.add(EntityType.SNOWBALL);
whitelist.add(EntityType.EGG); whitelist.add(EntityType.EGG);
whitelist.add(EntityType.SPLASH_POTION); whitelist.add(EntityType.POTION);
whitelist.add(EntityType.ARROW); whitelist.add(EntityType.ARROW);
} }