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

Debug

Browse Source
This commit is contained in:
Roch Blonndiaux 2023-01-23 15:56:55 +01:00
parent 8180ff00cb
commit 041878309d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/inventory/PlayerInventoryUpdater.java
View File

@ -70,7 +70,10 @@ public class PlayerInventoryUpdater implements Runnable {
if (mmoItem.hasData(ItemStats.PERM_EFFECTS)) if (mmoItem.hasData(ItemStats.PERM_EFFECTS))
((PotionEffectListData) mmoItem.getData(ItemStats.PERM_EFFECTS)) ((PotionEffectListData) mmoItem.getData(ItemStats.PERM_EFFECTS))
.getEffects() .getEffects()
.forEach(effect -> this.data.getPermanentPotionEffectsMap().remove(effect.getType(), effect.toEffect())); .forEach(effect -> {
this.data.getPermanentPotionEffectsMap().remove(effect.getType(), effect.toEffect());
MMOItems.log("Pot effect removed: " + effect.getType());
});
// Item particles // Item particles
if (mmoItem.hasData(ItemStats.ITEM_PARTICLES)) { if (mmoItem.hasData(ItemStats.ITEM_PARTICLES)) {
@ -81,11 +84,13 @@ public class PlayerInventoryUpdater implements Runnable {
&& this.data.getOverridingItemParticles().getParticleData().equals(particleData)) { && this.data.getOverridingItemParticles().getParticleData().equals(particleData)) {
this.data.getOverridingItemParticles().cancel(); this.data.getOverridingItemParticles().cancel();
this.data.resetOverridingItemParticles(); this.data.resetOverridingItemParticles();
MMOItems.log("Overriding particle removed: " + particleData.getType());
} }
} else { } else {
this.data.getItemParticles() this.data.getItemParticles()
.stream() .stream()
.filter(particleRunnable -> particleRunnable.getParticleData().equals(particleData)) .filter(particleRunnable -> particleRunnable.getParticleData().equals(particleData))
.peek(particleRunnable -> MMOItems.log("Particle removed: " + particleRunnable.getParticleData().getType()))
.forEach(BukkitRunnable::cancel); .forEach(BukkitRunnable::cancel);
this.data.getItemParticles().removeIf(BukkitRunnable::isCancelled); this.data.getItemParticles().removeIf(BukkitRunnable::isCancelled);
} }
@ -97,6 +102,7 @@ public class PlayerInventoryUpdater implements Runnable {
List<String> permissions = new ArrayList<>(((StringListData) mmoItem.getData(ItemStats.GRANTED_PERMISSIONS)).getList()); List<String> permissions = new ArrayList<>(((StringListData) mmoItem.getData(ItemStats.GRANTED_PERMISSIONS)).getList());
permissions.forEach(s -> { permissions.forEach(s -> {
this.data.permissions().remove(s); this.data.permissions().remove(s);
MMOItems.log("Perm removed: " + s);
if (perms.has(this.data.getPlayer(), s)) if (perms.has(this.data.getPlayer(), s))
perms.playerRemove(this.data.getPlayer(), s); perms.playerRemove(this.data.getPlayer(), s);
}); });
@ -145,6 +151,7 @@ public class PlayerInventoryUpdater implements Runnable {
for (AbilityData abilityData : ((AbilityListData) mmoItem.getData(ItemStats.ABILITIES)).getAbilities()) { for (AbilityData abilityData : ((AbilityListData) mmoItem.getData(ItemStats.ABILITIES)).getAbilities()) {
ModifierSource modSource = eItem.getCached().getType().getModifierSource(); ModifierSource modSource = eItem.getCached().getType().getModifierSource();
this.data.getMMOPlayerData().getPassiveSkillMap().addModifier(new PassiveSkill("MMOItemsItem", abilityData, equipmentSlot, modSource)); this.data.getMMOPlayerData().getPassiveSkillMap().addModifier(new PassiveSkill("MMOItemsItem", abilityData, equipmentSlot, modSource));
MMOItems.log("Ability added: " + abilityData.getTrigger());
} }
} }
@ -159,6 +166,7 @@ public class PlayerInventoryUpdater implements Runnable {
.getEffects() .getEffects()
.stream() .stream()
.filter(potionEffectData -> this.data.getPermanentPotionEffectAmplifier(potionEffectData.getType()) < potionEffectData.getLevel() - 1) .filter(potionEffectData -> this.data.getPermanentPotionEffectAmplifier(potionEffectData.getType()) < potionEffectData.getLevel() - 1)
.peek(potionEffectData -> MMOItems.log("Pot effect added: " + potionEffectData.getType()))
.forEach(effect -> this.data.getPermanentPotionEffectsMap().put(effect.getType(), effect.toEffect())); .forEach(effect -> this.data.getPermanentPotionEffectsMap().put(effect.getType(), effect.toEffect()));
if (MMOItems.plugin.hasPermissions() && mmoItem.hasData(ItemStats.GRANTED_PERMISSIONS)) { if (MMOItems.plugin.hasPermissions() && mmoItem.hasData(ItemStats.GRANTED_PERMISSIONS)) {
@ -167,6 +175,7 @@ public class PlayerInventoryUpdater implements Runnable {
this.data.permissions() this.data.permissions()
.stream() .stream()
.filter(s -> !perms.has(this.data.getPlayer(), s)) .filter(s -> !perms.has(this.data.getPlayer(), s))
.peek(s -> MMOItems.log("Perm added: " + s))
.forEach(perm -> perms.playerAdd(this.data.getPlayer(), perm)); .forEach(perm -> perms.playerAdd(this.data.getPlayer(), perm));
} }