mirror of
https://github.com/hyperdefined/ToolStats.git
synced 2025-12-10 22:55:04 +00:00
added damage done system
This commit is contained in:
hyperdefined
@@ -133,6 +133,10 @@ public class AnvilEvent implements Listener {
|
||||
addToken(event, tokenType, "mob-kills", clone);
|
||||
return;
|
||||
}
|
||||
if (tokenType.equalsIgnoreCase("damage-done")) {
|
||||
addToken(event, tokenType, "damage-done", clone);
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (firstSlotMaterial == Material.BOW || firstSlotMaterial == Material.CROSSBOW) {
|
||||
@@ -148,6 +152,10 @@ public class AnvilEvent implements Listener {
|
||||
addToken(event, tokenType, "arrows-shot", clone);
|
||||
return;
|
||||
}
|
||||
if (tokenType.equalsIgnoreCase("damage-done")) {
|
||||
addToken(event, tokenType, "damage-done", clone);
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (firstSlotMaterial == Material.ELYTRA) {
|
||||
@@ -203,7 +211,16 @@ public class AnvilEvent implements Listener {
|
||||
}
|
||||
case "damage-taken": {
|
||||
if (toolStats.config.getBoolean("enabled.armor-damage")) {
|
||||
newItem.setItemMeta(toolStats.itemLore.updateDamage(newItem, 0.0, false));
|
||||
newItem.setItemMeta(toolStats.itemLore.updateArmorDamage(newItem, 0.0, false));
|
||||
} else {
|
||||
event.setResult(null);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case "damage-done": {
|
||||
if (toolStats.configTools.checkConfig(newItem.getType(), "damage-done")) {
|
||||
newItem.setItemMeta(toolStats.itemLore.updateWeaponDamage(newItem, 0.0, false));
|
||||
} else {
|
||||
event.setResult(null);
|
||||
return;
|
||||
@@ -338,7 +355,15 @@ public class AnvilEvent implements Listener {
|
||||
if (armorDamage == null) {
|
||||
return;
|
||||
}
|
||||
meta = toolStats.itemLore.updateDamage(finalItem, -armorDamage, true);
|
||||
meta = toolStats.itemLore.updateArmorDamage(finalItem, -armorDamage, true);
|
||||
finalItem.setItemMeta(meta);
|
||||
}
|
||||
if (container.has(toolStats.damageDone)) {
|
||||
Double damageDone = container.get(toolStats.damageDone, PersistentDataType.DOUBLE);
|
||||
if (damageDone == null) {
|
||||
return;
|
||||
}
|
||||
meta = toolStats.itemLore.updateArmorDamage(finalItem, -damageDone, true);
|
||||
finalItem.setItemMeta(meta);
|
||||
}
|
||||
if (container.has(toolStats.arrowsShot)) {
|
||||
|
||||
@@ -18,12 +18,10 @@
|
||||
package lol.hyper.toolstats.events;
|
||||
|
||||
import lol.hyper.toolstats.ToolStats;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.Arrow;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Trident;
|
||||
import org.bukkit.entity.*;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
@@ -33,12 +31,14 @@ import org.bukkit.event.entity.EntityDamageEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.PlayerInventory;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
import org.bukkit.projectiles.ProjectileSource;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class EntityDamage implements Listener {
|
||||
|
||||
private final ToolStats toolStats;
|
||||
// track mobs that are killed by a player
|
||||
public final Set<UUID> trackedMobs = new HashSet<>();
|
||||
private final List<EntityDamageEvent.DamageCause> ignoredCauses = Arrays.asList(EntityDamageEvent.DamageCause.SUICIDE, EntityDamageEvent.DamageCause.VOID, EntityDamageEvent.DamageCause.CUSTOM, EntityDamageEvent.DamageCause.KILL);
|
||||
|
||||
@@ -62,105 +62,84 @@ public class EntityDamage implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
// mob is going to die
|
||||
if (mobBeingAttacked.getHealth() - event.getFinalDamage() <= 0) {
|
||||
// a player is killing something
|
||||
if (event.getDamager() instanceof Player attackingPlayer) {
|
||||
if (attackingPlayer.getGameMode() == GameMode.CREATIVE || attackingPlayer.getGameMode() == GameMode.SPECTATOR) {
|
||||
return;
|
||||
}
|
||||
PlayerInventory attackingPlayerInventory = attackingPlayer.getInventory();
|
||||
ItemStack heldItem = attackingPlayerInventory.getItemInMainHand();
|
||||
// only check certain items
|
||||
if (!toolStats.itemChecker.isMeleeWeapon(heldItem.getType())) {
|
||||
return;
|
||||
}
|
||||
// a player is killing another player
|
||||
if (mobBeingAttacked instanceof Player) {
|
||||
ItemMeta newItem = toolStats.itemLore.updatePlayerKills(heldItem, 1);
|
||||
if (newItem != null) {
|
||||
attackingPlayerInventory.getItemInMainHand().setItemMeta(newItem);
|
||||
}
|
||||
updateArmorDamage(((Player) mobBeingAttacked).getInventory(), event.getFinalDamage());
|
||||
return;
|
||||
}
|
||||
// player is killing regular mob
|
||||
ItemMeta newItem = toolStats.itemLore.updateMobKills(heldItem, 1);
|
||||
if (newItem != null) {
|
||||
attackingPlayerInventory.getItemInMainHand().setItemMeta(newItem);
|
||||
}
|
||||
trackedMobs.add(mobBeingAttacked.getUniqueId());
|
||||
}
|
||||
// trident is being thrown at something
|
||||
if (event.getDamager() instanceof Trident trident) {
|
||||
ItemStack newTrident = trident.getItemStack();
|
||||
ItemMeta newMeta;
|
||||
// trident is killing player
|
||||
if (mobBeingAttacked instanceof Player) {
|
||||
updateArmorDamage(((Player) mobBeingAttacked).getInventory(), event.getFinalDamage());
|
||||
newMeta = toolStats.itemLore.updatePlayerKills(trident.getItemStack(), 1);
|
||||
} else {
|
||||
// trident is killing a mob
|
||||
newMeta = toolStats.itemLore.updateMobKills(trident.getItemStack(), 1);
|
||||
trackedMobs.add(mobBeingAttacked.getUniqueId());
|
||||
}
|
||||
if (newMeta != null) {
|
||||
newTrident.setItemMeta(newMeta);
|
||||
trident.setItemStack(newTrident);
|
||||
}
|
||||
}
|
||||
// arrow is being shot
|
||||
if (event.getDamager() instanceof Arrow arrow) {
|
||||
// if the shooter is a player
|
||||
if (arrow.getShooter() instanceof Player shootingPlayer) {
|
||||
if (shootingPlayer.getGameMode() == GameMode.CREATIVE || shootingPlayer.getGameMode() == GameMode.SPECTATOR) {
|
||||
return;
|
||||
}
|
||||
PlayerInventory shootingPlayerInventory = shootingPlayer.getInventory();
|
||||
ItemStack heldBow = toolStats.itemChecker.getBow(shootingPlayerInventory);
|
||||
if (heldBow == null) {
|
||||
return;
|
||||
}
|
||||
Entity damager = event.getDamager();
|
||||
boolean playerAttacking = damager instanceof Player;
|
||||
boolean playerBeingAttacked = mobBeingAttacked instanceof Player;
|
||||
double finalDamage = event.getFinalDamage();
|
||||
boolean modDied = mobBeingAttacked.getHealth() - finalDamage <= 0;
|
||||
|
||||
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 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);
|
||||
}
|
||||
}
|
||||
updateArmorDamage(((Player) mobBeingAttacked).getInventory(), event.getFinalDamage());
|
||||
} else {
|
||||
// player is shooting a mob
|
||||
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());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// player is taken damage but not being killed
|
||||
if (mobBeingAttacked instanceof Player playerTakingDamage) {
|
||||
if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
|
||||
// player attacks something
|
||||
if (playerAttacking) {
|
||||
PlayerInventory playerAttackingInventory = ((Player) damager).getInventory();
|
||||
// make sure the item the player used is an item we want
|
||||
if (!toolStats.itemChecker.isMeleeWeapon(playerAttackingInventory.getItemInMainHand().getType())) {
|
||||
return;
|
||||
}
|
||||
updateArmorDamage(playerTakingDamage.getInventory(), event.getFinalDamage());
|
||||
|
||||
// update their weapon's damage
|
||||
updateWeaponDamage(playerAttackingInventory, event.getFinalDamage());
|
||||
|
||||
// the mob the player attacked died
|
||||
if (modDied) {
|
||||
// player killed another player
|
||||
if (playerBeingAttacked) {
|
||||
updateWeaponKills(playerAttackingInventory, "player");
|
||||
} else {
|
||||
// player kills a regular mob
|
||||
updateWeaponKills(playerAttackingInventory, "mob");
|
||||
}
|
||||
}
|
||||
|
||||
trackedMobs.add(mobBeingAttacked.getUniqueId());
|
||||
Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> trackedMobs.remove(mobBeingAttacked.getUniqueId()), 20);
|
||||
}
|
||||
|
||||
// something was hit by a trident
|
||||
if (damager instanceof Trident trident) {
|
||||
ProjectileSource source = trident.getShooter();
|
||||
if (source instanceof Player) {
|
||||
// update the trident's tracked damage
|
||||
updateTridentDamage(trident, finalDamage);
|
||||
|
||||
// if the mob died from the trident
|
||||
if (modDied) {
|
||||
// if the trident killed a player, update the kills
|
||||
if (playerBeingAttacked) {
|
||||
updateTridentKills(trident, "player");
|
||||
} else {
|
||||
// the trident killed a mob, update the kills
|
||||
updateTridentKills(trident, "mob");
|
||||
}
|
||||
}
|
||||
|
||||
trackedMobs.add(mobBeingAttacked.getUniqueId());
|
||||
Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> trackedMobs.remove(mobBeingAttacked.getUniqueId()), 20);
|
||||
}
|
||||
}
|
||||
|
||||
// something was hit by an arrow
|
||||
if (damager instanceof Arrow arrow) {
|
||||
ProjectileSource source = arrow.getShooter();
|
||||
|
||||
// a player shot the arrow
|
||||
if (source instanceof Player shootingPlayer) {
|
||||
// update the player's bow damage
|
||||
updateBowDamage(shootingPlayer.getInventory(), finalDamage);
|
||||
|
||||
// if the mob died from the arrow
|
||||
if (modDied) {
|
||||
if (playerBeingAttacked) {
|
||||
// player killed another player with an arrow
|
||||
updateBowKills(shootingPlayer.getInventory(), "player");
|
||||
} else {
|
||||
// player killed mob with an arrow
|
||||
updateBowKills(shootingPlayer.getInventory(), "mob");
|
||||
}
|
||||
}
|
||||
|
||||
trackedMobs.add(mobBeingAttacked.getUniqueId());
|
||||
Bukkit.getGlobalRegionScheduler().runDelayed(toolStats, scheduledTask -> trackedMobs.remove(mobBeingAttacked.getUniqueId()), 20);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -176,28 +155,7 @@ public class EntityDamage implements Listener {
|
||||
return;
|
||||
}
|
||||
|
||||
// player is taken damage but not being killed
|
||||
if (mobBeingAttacked instanceof Player playerTakingDamage) {
|
||||
if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
|
||||
return;
|
||||
}
|
||||
updateArmorDamage(playerTakingDamage.getInventory(), event.getFinalDamage());
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR)
|
||||
public void onDamage(EntityDamageByBlockEvent event) {
|
||||
if (!(event.getEntity() instanceof LivingEntity mobBeingAttacked)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// ignore void and /kill damage
|
||||
EntityDamageEvent.DamageCause cause = event.getCause();
|
||||
if (ignoredCauses.contains(cause)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// player is taken damage but not being killed
|
||||
// player is taking damage
|
||||
if (mobBeingAttacked instanceof Player playerTakingDamage) {
|
||||
if (playerTakingDamage.getGameMode() == GameMode.CREATIVE || playerTakingDamage.getGameMode() == GameMode.SPECTATOR) {
|
||||
return;
|
||||
@@ -211,7 +169,7 @@ public class EntityDamage implements Listener {
|
||||
for (ItemStack armorPiece : armorContents) {
|
||||
if (armorPiece != null) {
|
||||
if (toolStats.itemChecker.isArmor(armorPiece.getType())) {
|
||||
ItemMeta newItem = toolStats.itemLore.updateDamage(armorPiece, damage, false);
|
||||
ItemMeta newItem = toolStats.itemLore.updateArmorDamage(armorPiece, damage, false);
|
||||
if (newItem != null) {
|
||||
armorPiece.setItemMeta(newItem);
|
||||
}
|
||||
@@ -221,4 +179,109 @@ public class EntityDamage implements Listener {
|
||||
// apply the new armor
|
||||
playerInventory.setArmorContents(armorContents);
|
||||
}
|
||||
|
||||
private void updateBowDamage(PlayerInventory playerInventory, double damage) {
|
||||
ItemStack heldBow = toolStats.itemChecker.getBow(playerInventory);
|
||||
if (heldBow == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean isMain = playerInventory.getItemInMainHand().getType() == Material.BOW || playerInventory.getItemInMainHand().getType() == Material.CROSSBOW;
|
||||
boolean isOffHand = playerInventory.getItemInOffHand().getType() == Material.BOW || playerInventory.getItemInOffHand().getType() == Material.CROSSBOW;
|
||||
ItemMeta newBowDamage = toolStats.itemLore.updateWeaponDamage(playerInventory.getItemInMainHand(), damage, false);
|
||||
//toolStats.logger.info(newBowDamage.toString());
|
||||
|
||||
// player is shooting another player
|
||||
if (newBowDamage != null) {
|
||||
if (isMain && isOffHand) {
|
||||
playerInventory.getItemInMainHand().setItemMeta(newBowDamage);
|
||||
} else if (isMain) {
|
||||
playerInventory.getItemInMainHand().setItemMeta(newBowDamage);
|
||||
} else if (isOffHand) {
|
||||
playerInventory.getItemInOffHand().setItemMeta(newBowDamage);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void updateBowKills(PlayerInventory playerInventory, String type) {
|
||||
ItemStack heldBow = toolStats.itemChecker.getBow(playerInventory);
|
||||
if (heldBow == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean isMain = playerInventory.getItemInMainHand().getType() == Material.BOW || playerInventory.getItemInMainHand().getType() == Material.CROSSBOW;
|
||||
boolean isOffHand = playerInventory.getItemInOffHand().getType() == Material.BOW || playerInventory.getItemInOffHand().getType() == Material.CROSSBOW;
|
||||
|
||||
if (type.equalsIgnoreCase("mob")) {
|
||||
// player is shooting a mob
|
||||
ItemMeta newBow = toolStats.itemLore.updateMobKills(heldBow, 1);
|
||||
if (newBow != null) {
|
||||
if (isMain && isOffHand) {
|
||||
playerInventory.getItemInMainHand().setItemMeta(newBow);
|
||||
} else if (isMain) {
|
||||
playerInventory.getItemInMainHand().setItemMeta(newBow);
|
||||
} else if (isOffHand) {
|
||||
playerInventory.getItemInOffHand().setItemMeta(newBow);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (type.equalsIgnoreCase("player")) {
|
||||
ItemMeta newBowKills = toolStats.itemLore.updatePlayerKills(heldBow, 1);
|
||||
if (newBowKills != null) {
|
||||
if (isMain && isOffHand) {
|
||||
playerInventory.getItemInMainHand().setItemMeta(newBowKills);
|
||||
} else if (isMain) {
|
||||
playerInventory.getItemInMainHand().setItemMeta(newBowKills);
|
||||
} else if (isOffHand) {
|
||||
playerInventory.getItemInOffHand().setItemMeta(newBowKills);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void updateTridentKills(Trident trident, String type) {
|
||||
ItemStack newTrident = trident.getItemStack();
|
||||
ItemMeta newKills;
|
||||
if (type.equalsIgnoreCase("player")) {
|
||||
newKills = toolStats.itemLore.updatePlayerKills(trident.getItemStack(), 1);
|
||||
} else {
|
||||
newKills = toolStats.itemLore.updateMobKills(trident.getItemStack(), 1);
|
||||
}
|
||||
if (newKills != null) {
|
||||
newTrident.setItemMeta(newKills);
|
||||
trident.setItemStack(newTrident);
|
||||
}
|
||||
}
|
||||
|
||||
private void updateTridentDamage(Trident trident, double damage) {
|
||||
ItemStack newTrident = trident.getItemStack();
|
||||
ItemMeta newDamage = toolStats.itemLore.updateWeaponDamage(trident.getItemStack(), damage, false);
|
||||
if (newDamage != null) {
|
||||
newTrident.setItemMeta(newDamage);
|
||||
trident.setItemStack(newTrident);
|
||||
}
|
||||
}
|
||||
|
||||
private void updateWeaponDamage(PlayerInventory playerInventory, double damage) {
|
||||
ItemStack heldWeapon = playerInventory.getItemInMainHand();
|
||||
ItemMeta newHeldWeaponMeta = toolStats.itemLore.updateWeaponDamage(heldWeapon, damage, false);
|
||||
if (newHeldWeaponMeta != null) {
|
||||
playerInventory.getItemInMainHand().setItemMeta(newHeldWeaponMeta);
|
||||
}
|
||||
}
|
||||
|
||||
private void updateWeaponKills(PlayerInventory playerInventory, String type) {
|
||||
ItemStack heldWeapon = playerInventory.getItemInMainHand();
|
||||
ItemMeta newHeldWeaponMeta = null;
|
||||
if (type.equalsIgnoreCase("player")) {
|
||||
newHeldWeaponMeta = toolStats.itemLore.updatePlayerKills(heldWeapon, 1);
|
||||
}
|
||||
if (type.equalsIgnoreCase("mob")) {
|
||||
newHeldWeaponMeta = toolStats.itemLore.updateMobKills(heldWeapon, 1);
|
||||
}
|
||||
if (newHeldWeaponMeta != null) {
|
||||
playerInventory.getItemInMainHand().setItemMeta(newHeldWeaponMeta);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user