NotAlexNoyle/KitPvP
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #190 from cervinakuy/next-update

Browse Source 
Merge next-update into master
This commit is contained in:
Cervinakuy authored and GitHub committed 2021-12-28 23:34:48 -08:00
2 parents b165b1a704 59904d1422
commit 879693a66d
10 files changed
+59 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pom.xml
+6 -6
View File
@@ -6,7 +6,7 @@
<groupId>com.planetgallium</groupId>
<artifactId>KitPvP</artifactId>
<version>2.1.9</version>
<version>2.2.0</version>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
@@ -66,7 +66,7 @@
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>false</shadedArtifactAttached>
<outputFile>/Users/nico/Developer/SpigotL/plugins/${project.artifactId}.jar</outputFile>
<outputFile>/Users/nico/Developer/Spigot/Latest/plugins/${project.artifactId}.jar</outputFile>
</configuration>
</execution>
</executions>
@@ -84,13 +84,13 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.10.3</version>
<version>2.11.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -108,7 +108,7 @@
<dependency>
<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>7.9.1.1</version>
<version>8.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -132,7 +132,7 @@
</repository>
<repository>
<id>placeholderapi</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<repository>
<id>sk89q-repo</id>
src/main/java/com/planetgallium/kitpvp/Game.java
-3
View File
@@ -100,9 +100,6 @@ public class Game extends JavaPlugin implements Listener {
needsUpdate = true;
updateVersion = version;
break;
case LATEST:
Bukkit.getConsoleSender().sendMessage(Toolkit.translate("&7[&b&lKIT-PVP&7] &7No new update found. You are on the latest version."));
break;
case UNAVAILABLE:
Bukkit.getConsoleSender().sendMessage(Toolkit.translate("&7[&b&lKIT-PVP&7] &cUnable to perform an update check."));
break;
src/main/java/com/planetgallium/kitpvp/game/Arena.java
+4 -1
View File
@@ -56,7 +56,10 @@ public class Arena {
CacheManager.getPlayerAbilityCooldowns(p.getName()).clear();
kits.resetKit(p.getName());
killstreaks.setStreak(p, 0);
if (config.getBoolean("Arena.ResetKillStreakOnLeave")) {
killstreaks.setStreak(p, 0);
}
if (config.getBoolean("Arena.ClearPotionEffectsOnJoin")) {
for (PotionEffect effect : p.getActivePotionEffects()) {
src/main/java/com/planetgallium/kitpvp/game/Stats.java
+7 -1
View File
@@ -53,7 +53,8 @@ public class Stats {
public void addExperience(Player p, int experienceToAdd) {
if (levels.getBoolean("Levels.Levels.Enabled")) {
int currentExperience = getStat("experience", p.getName());
setStat("experience", p.getName(), currentExperience + experienceToAdd);
int newExperience = applyPossibleXPMultiplier(p, currentExperience + experienceToAdd);
setStat("experience", p.getName(), newExperience);
if (getStat("experience", p.getName()) >= getRegularOrRelativeNeededExperience(p.getName())) {
levelUp(p);
Bukkit.getPluginManager().callEvent(new PlayerLevelUpEvent(p, getStat("level", p.getName())));
@@ -61,6 +62,11 @@ public class Stats {
}
}
private int applyPossibleXPMultiplier(Player p, int experience) {
double xpMultiplier = Toolkit.getPermissionAmountDouble(p, "kp.xpmultiplier.", 1.0);
return (int) (experience * xpMultiplier);
}
public void levelUp(Player p) {
String username = p.getName();
src/main/java/com/planetgallium/kitpvp/item/AttributeParser.java
+1 -1
View File
@@ -317,7 +317,7 @@ public class AttributeParser {
return potion.toItemStack(item.getAmount());
} else if (Toolkit.versionToNumber() >= 19) {
potionMeta.setBasePotionData(new PotionData(potionType, isUpgraded, isExtended));
potionMeta.setBasePotionData(new PotionData(potionType, isExtended, isUpgraded));
}
item.setItemMeta(potionMeta);
src/main/java/com/planetgallium/kitpvp/listener/ArrowListener.java
+12 -6
View File
@@ -64,7 +64,9 @@ public class ArrowListener implements Listener {
}
// ARROW RETURN
ItemStack arrowToAdd = new ItemStack(Material.ARROW);
if (config.getBoolean("Combat.ArrowReturn.Enabled")) {
for (ItemStack items : shooter.getInventory().getContents()) {
@@ -72,10 +74,9 @@ public class ArrowListener implements Listener {
if (items != null && items.getType() == XMaterial.ARROW.parseMaterial() && items.getAmount() < 64) {
if (shooter.hasPermission("kp.arrowreturn")) {
ItemStack arrowInv = new ItemStack(Material.ARROW);
shooter.getInventory().addItem(arrowInv);
shooter.getInventory().addItem(arrowInv);
shooter.getInventory().addItem(arrowToAdd);
shooter.getInventory().addItem(arrowToAdd);
return;
@@ -89,7 +90,12 @@ public class ArrowListener implements Listener {
shooter.sendMessage(config.getString("Combat.ArrowReturn.NoSpace"));
}
} else {
shooter.getInventory().addItem(arrowToAdd);
shooter.getInventory().addItem(arrowToAdd);
}
}
src/main/java/com/planetgallium/kitpvp/listener/HitListener.java
+3 -3
View File
@@ -22,7 +22,7 @@ public class HitListener implements Listener {
this.config = plugin.getResources().getConfig();
String soundString = config.getString("Combat.HitSound.Sound") + ", 1, " + config.getInt("Combat.HitSound.Pitch");
this.hitSound = XSound.parse(null, Bukkit.getWorlds().get(0).getSpawnLocation(), soundString, false).join();
this.hitSound = XSound.parse(soundString);
}
@EventHandler
@@ -38,8 +38,8 @@ public class HitListener implements Listener {
arena.getHitCache().put(damagedPlayer.getName(), damager.getName());
if (config.getBoolean("Combat.HitSound.Enabled")) {
hitSound.play(damagedPlayer.getLocation());
hitSound.play(damager.getLocation());
hitSound.forPlayer(damagedPlayer).play();
hitSound.forPlayer(damager).play();
}
}
src/main/java/com/planetgallium/kitpvp/listener/JoinListener.java
+5 -6
View File
@@ -1,6 +1,5 @@
package com.planetgallium.kitpvp.listener;
import com.planetgallium.kitpvp.util.CacheManager;
import com.planetgallium.kitpvp.util.Resource;
import com.planetgallium.kitpvp.util.Resources;
import org.bukkit.entity.Player;
@@ -15,10 +14,10 @@ import com.planetgallium.kitpvp.util.Toolkit;
public class JoinListener implements Listener {
private Game plugin;
private Arena arena;
private Resources resources;
private Resource config;
private final Game plugin;
private final Arena arena;
private final Resources resources;
private final Resource config;
public JoinListener(Game plugin) {
this.plugin = plugin;
@@ -26,7 +25,7 @@ public class JoinListener implements Listener {
this.resources = plugin.getResources();
this.config = resources.getConfig();
}
@EventHandler
public void onJoin(PlayerJoinEvent e) {
src/main/java/com/planetgallium/kitpvp/util/Toolkit.java
+20
View File
@@ -146,6 +146,8 @@ public class Toolkit {
return 116;
} else if (version.contains("1.17")) {
return 117;
} else if (version.contains("1.18")) {
return 118;
}
return 500;
@@ -297,6 +299,24 @@ public class Toolkit {
}
// TODO: eventually merge the below two methods into one
public static double getPermissionAmountDouble(Player player, String permissionPrefix, double defaultValue) {
double highestPermissionValue = 0.0;
for (PermissionAttachmentInfo attachmentInfo : player.getEffectivePermissions()) {
String permission = attachmentInfo.getPermission();
if (permission.startsWith(permissionPrefix)) {
// strips from some.permission.49 to just 49
double permissionValue = Double.parseDouble(permission.substring(permissionPrefix.length()));
if (permissionValue > highestPermissionValue) {
highestPermissionValue = permissionValue;
}
}
}
return highestPermissionValue == 0.0 ? defaultValue : highestPermissionValue;
}
public static int getPermissionAmount(Player player, String permissionPrefix, int defaultValue) {
// String permissionPrefix = "some.permission.here.";
if (!player.isOp()) {
src/main/resources/plugin.yml
+1 -1
View File
@@ -1,7 +1,7 @@
name: KitPvP
author: Cervinakuy
main: com.planetgallium.kitpvp.Game
version: 2.1.9
version: 2.2.0
description: The ultimate all-in-one KitPvP plugin.
website: https://www.spigotmc.org/resources/27107/
softdepend: [PlaceholderAPI, WorldGuard]