mirror of
https://github.com/hyperdefined/ToolStats.git
synced 2025-12-24 10:15:07 +00:00
Compare commits
8 Commits
1.9.2-hotf
...
71f3a3ea10
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71f3a3ea10 | ||
|
|
3f850aaef7 | ||
|
|
427628da6e | ||
|
|
820c1dce51 | ||
|
|
ad1a4fe26e | ||
|
|
ceb1dbd297 | ||
|
|
49f4727100 | ||
|
|
cb5345bd14 |
6
pom.xml
6
pom.xml
@@ -23,7 +23,7 @@
|
||||
|
||||
<groupId>lol.hyper</groupId>
|
||||
<artifactId>toolstats</artifactId>
|
||||
<version>1.9.2-hotfix</version>
|
||||
<version>1.9.3</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>ToolStats</name>
|
||||
@@ -37,7 +37,7 @@
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>3.4.0</version>
|
||||
<version>3.4.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>auto-clean</id>
|
||||
@@ -51,7 +51,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.13.0</version>
|
||||
<version>3.14.0</version>
|
||||
<configuration>
|
||||
<source>${java.version}</source>
|
||||
<target>${java.version}</target>
|
||||
|
||||
@@ -19,6 +19,7 @@ package lol.hyper.toolstats;
|
||||
|
||||
import lol.hyper.githubreleaseapi.GitHubRelease;
|
||||
import lol.hyper.githubreleaseapi.GitHubReleaseAPI;
|
||||
import lol.hyper.githubreleaseapi.ReleaseNotFoundException;
|
||||
import lol.hyper.toolstats.commands.CommandToolStats;
|
||||
import lol.hyper.toolstats.events.*;
|
||||
import lol.hyper.toolstats.tools.*;
|
||||
@@ -251,12 +252,14 @@ public final class ToolStats extends JavaPlugin {
|
||||
e.printStackTrace();
|
||||
return;
|
||||
}
|
||||
GitHubRelease current = api.getReleaseByTag(this.getPluginMeta().getVersion());
|
||||
GitHubRelease latest = api.getLatestVersion();
|
||||
if (current == null) {
|
||||
GitHubRelease current;
|
||||
try {
|
||||
current = api.getReleaseByTag(this.getPluginMeta().getVersion());
|
||||
} catch (ReleaseNotFoundException e) {
|
||||
logger.warning("You are running a version that does not exist on GitHub. If you are in a dev environment, you can ignore this. Otherwise, this is a bug!");
|
||||
return;
|
||||
}
|
||||
GitHubRelease latest = api.getLatestVersion();
|
||||
int buildsBehind = api.getBuildsBehind(current);
|
||||
if (buildsBehind == 0) {
|
||||
logger.info("You are running the latest version.");
|
||||
|
||||
@@ -19,6 +19,7 @@ package lol.hyper.toolstats.events;
|
||||
|
||||
import lol.hyper.toolstats.ToolStats;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
@@ -119,17 +120,32 @@ public class EntityDamage implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean isMain = shootingPlayerInventory.getItemInMainHand().getType() == Material.BOW || shootingPlayerInventory.getItemInMainHand().getType() == Material.CROSSBOW;
|
||||
boolean isOffHand = shootingPlayerInventory.getItemInOffHand().getType() == Material.BOW || shootingPlayerInventory.getItemInOffHand().getType() == Material.CROSSBOW;
|
||||
|
||||
// player is shooting another player
|
||||
if (mobBeingAttacked instanceof Player) {
|
||||
ItemMeta newItem = toolStats.itemLore.updatePlayerKills(heldBow, 1);
|
||||
if (newItem != null) {
|
||||
shootingPlayerInventory.getItemInMainHand().setItemMeta(newItem);
|
||||
ItemMeta newBow = toolStats.itemLore.updatePlayerKills(heldBow, 1);
|
||||
if (newBow != null) {
|
||||
if (isMain && isOffHand) {
|
||||
shootingPlayerInventory.getItemInMainHand().setItemMeta(newBow);
|
||||
} else if (isMain) {
|
||||
shootingPlayerInventory.getItemInMainHand().setItemMeta(newBow);
|
||||
} else if (isOffHand) {
|
||||
shootingPlayerInventory.getItemInOffHand().setItemMeta(newBow);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// player is shooting a mob
|
||||
ItemMeta newItem = toolStats.itemLore.updateMobKills(heldBow, 1);
|
||||
if (newItem != null) {
|
||||
shootingPlayerInventory.getItemInMainHand().setItemMeta(newItem);
|
||||
ItemMeta newBow = toolStats.itemLore.updateMobKills(heldBow, 1);
|
||||
if (newBow != null) {
|
||||
if (isMain && isOffHand) {
|
||||
shootingPlayerInventory.getItemInMainHand().setItemMeta(newBow);
|
||||
} else if (isMain) {
|
||||
shootingPlayerInventory.getItemInMainHand().setItemMeta(newBow);
|
||||
} else if (isOffHand) {
|
||||
shootingPlayerInventory.getItemInOffHand().setItemMeta(newBow);
|
||||
}
|
||||
}
|
||||
trackedMobs.add(mobBeingAttacked.getUniqueId());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user