Merge pull request #25 from CubeCrafter/development

1.1.16

Author: CubeCrafter72

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'me.cubecrafter'
-version = '1.1.15'
+version = '1.1.16'
 
 repositories {
     mavenCentral()
@@ -19,14 +19,14 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.cryptomorin:XSeries:9.1.0'
+    implementation 'com.github.cryptomorin:XSeries:9.3.1'
     implementation 'com.zaxxer:HikariCP:4.0.3'
     implementation 'org.slf4j:slf4j-simple:1.7.36'
     implementation 'org.bstats:bstats-bukkit:3.0.0'
-    implementation 'de.tr7zw:item-nbt-api:2.11.1'
+    implementation 'de.tr7zw:item-nbt-api:2.11.2'
     implementation 'fr.mrmicky:fastboard:1.2.1'
-    //implementation 'com.github.cubecrafter:XUtils:1.0.12'
-    implementation 'me.cubecrafter:XUtils:1.0.13'
+    implementation 'com.github.cubecrafter:XUtils:1.0.13'
+    //implementation 'me.cubecrafter:XUtils:1.0.13'
 
     compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT'
     compileOnly 'me.clip:placeholderapi:2.11.3'
@@ -40,15 +40,18 @@ dependencies {
 
 shadowJar {
     archiveFileName = 'WoolWars-' + project.version + '.jar'
+
     relocate 'me.cubecrafter.xutils', 'me.cubecrafter.woolwars.libs.xutils'
     relocate 'com.cryptomorin.xseries', 'me.cubecrafter.woolwars.libs.xseries'
     relocate 'com.zaxxer.hikari', 'me.cubecrafter.woolwars.libs.hikari'
     relocate 'org.bstats', 'me.cubecrafter.woolwars.libs.bstats'
     relocate 'de.tr7zw.changeme.nbtapi', 'me.cubecrafter.woolwars.libs.nbtapi'
     relocate 'de.tr7zw.annotations', 'me.cubecrafter.woolwars.libs.nbtapi.annotations'
     relocate 'fr.mrmicky.fastboard', 'me.cubecrafter.woolwars.libs.fastboard'
+
     exclude 'META-INF/**'
     exclude 'LICENSE'
+
     minimize()
 }
 

src/main/java/me/cubecrafter/woolwars/kit/Kit.java

@@ -18,6 +18,7 @@
 
 package me.cubecrafter.woolwars.kit;
 
+import com.cryptomorin.xseries.XPotion;
 import lombok.Getter;
 import me.cubecrafter.woolwars.WoolWars;
 import me.cubecrafter.woolwars.arena.team.Team;
@@ -29,8 +30,11 @@
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.potion.PotionEffect;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Getter
@@ -45,6 +49,7 @@ public class Kit {
 
     private final Map<Integer, ItemStack> contents = new HashMap<>();
     private final ItemStack[] armor = new ItemStack[4];
+    private final List<PotionEffect> effects = new ArrayList<>();
 
     private final Ability ability;
 
@@ -66,6 +71,11 @@ public Kit(String id, YamlConfiguration config) {
             if (section == null) continue;
             armor[i] = ItemBuilder.fromConfig(section).setUnbreakable(true).build();
         }
+
+        for (String effect : config.getStringList("effects")) {
+            String[] split = effect.split(":");
+            effects.add(XPotion.matchXPotion(split[0]).orElse(XPotion.SPEED).buildPotionEffect(Integer.MAX_VALUE, Integer.parseInt(split[1]) - 1));
+        }
     }
 
     public void addToPlayer(WoolPlayer player, Team team) {
@@ -75,6 +85,8 @@ public void addToPlayer(WoolPlayer player, Team team) {
         }
         player.getData().setSelectedKit(id);
 
+        player.getPlayer().getActivePotionEffects().forEach(effect -> player.getPlayer().removePotionEffect(effect.getType()));
+
         PlayerInventory inventory = player.getPlayer().getInventory();
         inventory.clear();
         inventory.setArmorContents(null);
@@ -103,6 +115,8 @@ public void addToPlayer(WoolPlayer player, Team team) {
         }
         inventory.setItem(ability.getSlot(), ability.getItem());
 
+        effects.forEach(effect -> player.getPlayer().addPotionEffect(effect));
+
         player.send(Messages.KIT_SELECTED.asString().replace("{name}", name));
     }
 

src/main/java/me/cubecrafter/woolwars/listeners/DamageListener.java

@@ -165,10 +165,13 @@ public static void handleDeath(WoolPlayer player, Arena arena) {
         player.getPlayer().setFlying(true);
         player.getPlayer().getInventory().setArmorContents(null);
         player.getPlayer().getInventory().clear();
-        player.getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 0, false, false));
-        player.getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false));
         player.getPlayer().setFireTicks(0);
         player.getPlayer().setHealth(20);
+        player.getPlayer().getActivePotionEffects().forEach(potionEffect -> player.getPlayer().removePotionEffect(potionEffect.getType()));
+
+        player.getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 0, false, false));
+        player.getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false));
+
         player.sendTitle(Messages.DEATH_TITLE.asString(), Messages.DEATH_SUBTITLE.asString(), 2);
 
         for (WoolPlayer alive : arena.getAlivePlayers()) {

src/main/resources/kits/archer.yml

@@ -2,6 +2,9 @@
 name: "Archer"
 # If set to true, players will require the permission "woolwars.kit.<id>" to use this kit
 permission-required: false
+# A list of effects that will be applied to the player. Format: <effect-name>:<level> (e.g. SPEED:1)
+effects:
+  - "SPEED:2"
 # Armor pieces
 armor:
   helmet:

src/main/resources/kits/assault.yml

@@ -2,6 +2,8 @@
 name: "Assault"
 # If set to true, players will require the permission "woolwars.kit.<id>" to use this kit
 permission-required: false
+# A list of effects that will be applied to the player. Format: <effect-name>:<level> (e.g. SPEED:1)
+effects: []
 # Armor pieces
 armor:
   helmet:

src/main/resources/kits/engineer.yml

@@ -2,6 +2,8 @@
 name: "Engineer"
 # If set to true, players will require the permission "woolwars.kit.<id>" to use this kit
 permission-required: false
+# A list of effects that will be applied to the player. Format: <effect-name>:<level> (e.g. SPEED:1)
+effects: []
 # Armor pieces
 armor:
   helmet:

src/main/resources/kits/golem.yml

@@ -2,6 +2,8 @@
 name: "Golem"
 # If set to true, players will require the permission "woolwars.kit.<id>" to use this kit
 permission-required: false
+# A list of effects that will be applied to the player. Format: <effect-name>:<level> (e.g. SPEED:1)
+effects: []
 # Armor pieces
 armor:
   boots:

src/main/resources/kits/swordsman.yml

@@ -2,6 +2,8 @@
 name: "Swordsman"
 # If set to true, players will require the permission "woolwars.kit.<id>" to use this kit
 permission-required: false
+# A list of effects that will be applied to the player. Format: <effect-name>:<level> (e.g. SPEED:1)
+effects: []
 # Armor pieces
 armor:
   helmet:

src/main/resources/kits/tank.yml

@@ -2,6 +2,9 @@
 name: "Tank"
 # If set to true, players will require the permission "woolwars.kit.<id>" to use this kit
 permission-required: false
+# A list of effects that will be applied to the player. Format: <effect-name>:<level> (e.g. SPEED:1)
+effects:
+  - "ABSORPTION:1"
 # Armor pieces
 armor:
   helmet: