Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-01-08 07:27:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed potential confusions w/ stat methods

Browse Source
This commit is contained in:
Jules 2024-02-20 00:19:12 +01:00
parent 1fabd75d10
commit 7408899816
4 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/player/PlayerData.java
View File

@ -40,9 +40,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
public class PlayerData extends SynchronizedDataHolder implements Closeable {
@NotNull
private final MMOPlayerData mmoData;
// Reloaded everytime the player reconnects in case of major change.
private RPGPlayer rpgPlayer;
@ -62,7 +59,6 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
public PlayerData(@NotNull MMOPlayerData mmoData) {
super(mmoData);
this.mmoData = mmoData;
rpgPlayer = MMOItems.plugin.getMainRPG().getInfo(this);
stats = new PlayerStats(this);
}
@ -73,7 +69,7 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
}
public boolean isOnline() {
return mmoData.isOnline();
return getMMOPlayerData().isOnline();
}
public RPGPlayer getRPG() {
@ -93,7 +89,7 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
/**
* @return If the player hands are full i.e if the player is holding
* two items in their hands, one being two handed
* two items in their hands, one being two handed
*/
public boolean isEncumbered() {
@ -122,10 +118,8 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
this.rpgPlayer = rpgPlayer;
}
@SuppressWarnings("deprecation")
public void updateInventory() {
if (!mmoData.isOnline())
return;
if (!isOnline()) return;
/*
* Very important, clear particle data AFTER canceling the runnable
@ -134,7 +128,7 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
inventory.getEquipped().clear();
permanentEffects.clear();
cancelRunnables();
mmoData.getPassiveSkillMap().removeModifiers("MMOItemsItem");
getMMOPlayerData().getPassiveSkillMap().removeModifiers("MMOItemsItem");
itemParticles.clear();
overridingItemParticles = null;
if (MMOItems.plugin.hasPermissions()) {
@ -180,7 +174,7 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
if (item.hasData(ItemStats.ABILITIES))
for (AbilityData abilityData : ((AbilityListData) item.getData(ItemStats.ABILITIES)).getAbilities()) {
ModifierSource modSource = equipped.getCached().getType().getModifierSource();
mmoData.getPassiveSkillMap().addModifier(new PassiveSkill("MMOItemsItem", abilityData, equipped.getSlot(), modSource));
getMMOPlayerData().getPassiveSkillMap().addModifier(new PassiveSkill("MMOItemsItem", abilityData, equipped.getSlot(), modSource));
}
// Modifier application rules
@ -254,7 +248,7 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
perms.playerAdd(getPlayer(), perm);
}
for (AbilityData ability : setBonuses.getAbilities())
mmoData.getPassiveSkillMap().addModifier(new PassiveSkill("MMOItemsItem", ability, EquipmentSlot.OTHER, ModifierSource.OTHER));
getMMOPlayerData().getPassiveSkillMap().addModifier(new PassiveSkill("MMOItemsItem", ability, EquipmentSlot.OTHER, ModifierSource.OTHER));
for (ParticleData particle : setBonuses.getParticles())
itemParticles.add(particle.start(this));
for (PotionEffect effect : setBonuses.getPotionEffects())
@ -277,7 +271,7 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
inventory.offhand = getPlayer().getInventory().getItemInOffHand();
}
public void updateStats() {
public void timedRunnable() {
// Permanent effects
permanentEffects.values().forEach(effect -> getPlayer().addPotionEffect(effect));
@ -335,11 +329,11 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
}
public boolean isOnCooldown(CooldownType type) {
return mmoData.getCooldownMap().isOnCooldown(type.name());
return getMMOPlayerData().getCooldownMap().isOnCooldown(type.name());
}
public void applyCooldown(CooldownType type, double value) {
mmoData.getCooldownMap().applyCooldown(type.name(), value);
getMMOPlayerData().getCooldownMap().applyCooldown(type.name(), value);
}
/**
@ -347,7 +341,7 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
*/
@Deprecated
public boolean isOnCooldown(ItemReference ref) {
return mmoData.getCooldownMap().isOnCooldown(ref);
return getMMOPlayerData().getCooldownMap().isOnCooldown(ref);
}
/**
@ -355,7 +349,7 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
*/
@Deprecated
public void applyItemCooldown(ItemReference ref, double value) {
mmoData.getCooldownMap().applyCooldown(ref, value);
getMMOPlayerData().getCooldownMap().applyCooldown(ref, value);
}
/**
@ -363,7 +357,7 @@ public class PlayerData extends SynchronizedDataHolder implements Closeable {
*/
@Deprecated
public double getItemCooldown(ItemReference ref) {
return mmoData.getCooldownMap().getInfo(ref).getRemaining() / 1000d;
return getMMOPlayerData().getCooldownMap().getInfo(ref).getRemaining() / 1000d;
}
@NotNull

14
MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/player/PlayerStats.java
View File

@ -11,6 +11,7 @@ import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.player.inventory.EquippedItem;
import net.Indyuce.mmoitems.stat.type.AttackWeaponStat;
import net.Indyuce.mmoitems.stat.type.ItemStat;
import org.jetbrains.annotations.NotNull;
public class PlayerStats {
private final PlayerData playerData;
@ -23,15 +24,17 @@ public class PlayerStats {
return playerData;
}
@NotNull
public StatMap getMap() {
return playerData.getMMOPlayerData().getStatMap();
}
public double getStat(ItemStat<?, ?> stat) {
return getMap().getInstance(stat.getId()).getTotal();
public double getStat(@NotNull ItemStat<?, ?> stat) {
return getMap().getStat(stat.getId());
}
public StatInstance getInstance(ItemStat<?, ?> stat) {
@NotNull
public StatInstance getInstance(@NotNull ItemStat<?, ?> stat) {
return getMap().getInstance(stat.getId());
}
@ -44,7 +47,8 @@ public class PlayerStats {
* source will NOT be taken into account for stat calculation
* @return
*/
public PlayerMetadata newTemporary(EquipmentSlot castSlot) {
@NotNull
public PlayerMetadata newTemporary(@NotNull EquipmentSlot castSlot) {
return playerData.getMMOPlayerData().getStatMap().cache(castSlot);
}
@ -79,7 +83,7 @@ public class PlayerStats {
}
// Finally run a stat update after all modifiers have been gathered in the packet
packet.runUpdate();
packet.update();
}
}
}

2
MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/Amphibian.java
View File

@ -186,7 +186,7 @@ public class Amphibian extends ChooseStat implements ItemRestriction, GemStoneSt
}
}
//BKK//MMOItems. Log("Total: \u00a7e" + ret.size() + "\u00a77 blocks.");
//BKK//MMOItems. Log("Tot: \u00a7e" + ret.size() + "\u00a77 blocks.");
return ret;
}
}

2
MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/MMOItemsBukkit.java
View File

@ -37,6 +37,6 @@ public class MMOItemsBukkit {
if (MythicLib.plugin.hasProfiles())
Bukkit.getPluginManager().registerEvents(new ProfileSupportListener(), plugin);
Bukkit.getScheduler().runTaskTimer(plugin, () -> Bukkit.getOnlinePlayers().forEach(player -> PlayerData.get(player).updateStats()), 100, 20);
Bukkit.getScheduler().runTaskTimer(plugin, () -> Bukkit.getOnlinePlayers().forEach(player -> PlayerData.get(player).timedRunnable()), 100, 20);
}
}