Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Fixed combat placeholders

Browse Source
This commit is contained in:
Jules 2023-03-18 21:56:14 +01:00
parent e1011d449f
commit a3166b1049
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MMOCore-API/src/main/java/net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java
View File

@ -99,14 +99,13 @@ public class RPGPlaceholders extends PlaceholderExpansion {
return String.valueOf(playerData.getCombat().isInPvpMode()); return String.valueOf(playerData.getCombat().isInPvpMode());
else if (identifier.startsWith("since_enter_combat")) else if (identifier.startsWith("since_enter_combat"))
return playerData.isInCombat() ? MythicLib.plugin.getMMOConfig().decimal.format((System.currentTimeMillis() - playerData.getCombat().getFirstHit()) / 1000) : "-1"; return playerData.isInCombat() ? MythicLib.plugin.getMMOConfig().decimal.format((System.currentTimeMillis() - playerData.getCombat().getLastEntry()) / 1000.) : "-1";
else if (identifier.startsWith("invulnerability_left")) else if (identifier.startsWith("invulnerability_left"))
return MythicLib.plugin.getMMOConfig().decimal.format(Math.max(0, (double) (playerData.getCombat().getInvulnerableTill() - System.currentTimeMillis()) / 1000)); return MythicLib.plugin.getMMOConfig().decimal.format(Math.max(0, (playerData.getCombat().getInvulnerableTill() - System.currentTimeMillis()) / 1000.));
else if (identifier.startsWith("since_last_hit")) else if (identifier.startsWith("since_last_hit"))
return playerData.isInCombat() ? MythicLib.plugin.getMMOConfig().decimal.format((System.currentTimeMillis() - playerData.getCombat().getLastHit()) / 1000) : "-1"; return playerData.isInCombat() ? MythicLib.plugin.getMMOConfig().decimal.format((System.currentTimeMillis() - playerData.getCombat().getLastHit()) / 1000.) : "-1";
else if (identifier.startsWith("bound_")) { else if (identifier.startsWith("bound_")) {
int slot = Math.max(0, Integer.parseInt(identifier.substring(6)) - 1); int slot = Math.max(0, Integer.parseInt(identifier.substring(6)) - 1);

9
MMOCore-API/src/main/java/net/Indyuce/mmocore/player/CombatHandler.java
View File

@ -12,9 +12,7 @@ import org.jetbrains.annotations.Nullable;
public class CombatHandler implements Closable { public class CombatHandler implements Closable {
private final PlayerData player; private final PlayerData player;
private final long firstHit = System.currentTimeMillis(); private long lastEntry = System.currentTimeMillis(), lastHit = System.currentTimeMillis(), invulnerableTill;
private long lastHit = System.currentTimeMillis(), invulnerableTill;
private boolean pvpMode; private boolean pvpMode;
@ -37,6 +35,7 @@ public class CombatHandler implements Closable {
// Entering combat // Entering combat
} else { } else {
lastEntry = System.currentTimeMillis();
MMOCore.plugin.configManager.getSimpleMessage("now-in-combat").send(player.getPlayer()); MMOCore.plugin.configManager.getSimpleMessage("now-in-combat").send(player.getPlayer());
Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, true)); Bukkit.getPluginManager().callEvent(new PlayerCombatEvent(player, true));
task = newTask(); task = newTask();
@ -59,8 +58,8 @@ public class CombatHandler implements Closable {
return lastHit; return lastHit;
} }
public long getFirstHit() { public long getLastEntry() {
return firstHit; return lastEntry;
} }
public long getInvulnerableTill() { public long getInvulnerableTill() {