Upstream/mmocore
1
0
Fork 1
mirror of https://gitlab.com/phoenix-dvpmt/mmocore.git synced 2024-11-27 00:45:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug Fixing

Browse Source
This commit is contained in:
Ka0rX 2023-03-19 20:20:24 +01:00
parent 5db6ae79dc
commit 1d1d28958f
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -1140,11 +1140,12 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
} }
public boolean hasSkillBound(int slot) { public boolean hasSkillBound(int slot) {
return slot < boundSkills.size(); Bukkit.broadcastMessage("slot:"+slot+" "+boundSkills.containsKey(slot));
return boundSkills.containsKey(slot);
} }
public ClassSkill getBoundSkill(int slot) { public ClassSkill getBoundSkill(int slot) {
return slot >= boundSkills.size() ? null : boundSkills.get(slot).getClassSkill(); return boundSkills.containsKey(slot) ? boundSkills.get(slot).getClassSkill():null;
} }

7
MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/profess/skillbinding/SkillSlot.java
View File

@ -1,5 +1,6 @@
package net.Indyuce.mmocore.api.player.profess.skillbinding; package net.Indyuce.mmocore.api.player.profess.skillbinding;
import bsh.EvalError;
import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.MythicLib;
import net.Indyuce.mmocore.comp.mythicmobs.MythicHook; import net.Indyuce.mmocore.comp.mythicmobs.MythicHook;
import net.Indyuce.mmocore.skill.ClassSkill; import net.Indyuce.mmocore.skill.ClassSkill;
@ -27,7 +28,7 @@ public class SkillSlot {
public SkillSlot(ConfigurationSection section) { public SkillSlot(ConfigurationSection section) {
this.slot = Integer.parseInt(section.getName()); this.slot = Integer.parseInt(section.getName());
this.expression = section.getString("expression"); this.expression = section.contains("expression") ? section.getString("expression") : "true";
this.name = section.getString("name"); this.name = section.getString("name");
this.lore = section.getStringList("lore"); this.lore = section.getStringList("lore");
if (section.contains("item")) if (section.contains("item"))
@ -66,9 +67,9 @@ public class SkillSlot {
parsedExpression = parsedExpression.replace("<" + category + ">", "true"); parsedExpression = parsedExpression.replace("<" + category + ">", "true");
parsedExpression = parsedExpression.replaceAll("<.*>", "false"); parsedExpression = parsedExpression.replaceAll("<.*>", "false");
try { try {
boolean res = (boolean) MythicLib.plugin.getScriptEngine().eval(parsedExpression); boolean res = (boolean) MythicLib.plugin.getInterpreter().eval(parsedExpression);
return res; return res;
} catch (ScriptException e) { } catch (EvalError e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }

12
MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/SkillList.java
View File

@ -17,6 +17,7 @@ import net.Indyuce.mmocore.skill.ClassSkill;
import net.Indyuce.mmocore.skill.RegisteredSkill; import net.Indyuce.mmocore.skill.RegisteredSkill;
import net.Indyuce.mmocore.api.SoundEvent; import net.Indyuce.mmocore.api.SoundEvent;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
@ -67,12 +68,12 @@ public class SkillList extends EditableInventory {
return new SlotItem(config) { return new SlotItem(config) {
@Override @Override
public ItemStack display(SkillViewerInventory inv, int n) { public ItemStack display(SkillViewerInventory inv, int n) {
if (!inv.getPlayerData().getProfess().hasSlot(n)) { if (!inv.getPlayerData().getProfess().hasSlot(n+1)) {
return new ItemStack(Material.AIR); return new ItemStack(Material.AIR);
} }
SkillSlot skillSlot = inv.getPlayerData().getProfess().getSkillSlot(n); SkillSlot skillSlot = inv.getPlayerData().getProfess().getSkillSlot(n+1);
ItemStack item = super.display(inv, n); ItemStack item = super.display(inv, n);
if (!inv.getPlayerData().hasSkillBound(n)) { if (!inv.getPlayerData().hasSkillBound(n+1)) {
//If there is an item filled in the slot config it shows it, else shows the default item. //If there is an item filled in the slot config it shows it, else shows the default item.
Material material = skillSlot.hasItem() ? skillSlot.getItem() : super.emptyMaterial; Material material = skillSlot.hasItem() ? skillSlot.getItem() : super.emptyMaterial;
int customModelData = skillSlot.hasItem() ? skillSlot.getModelData() : super.emptyCMD; int customModelData = skillSlot.hasItem() ? skillSlot.getModelData() : super.emptyCMD;
@ -101,7 +102,7 @@ public class SkillList extends EditableInventory {
public Placeholders getPlaceholders(SkillViewerInventory inv, int n) { public Placeholders getPlaceholders(SkillViewerInventory inv, int n) {
Placeholders holders = super.getPlaceholders(inv, n); Placeholders holders = super.getPlaceholders(inv, n);
String none = MythicLib.plugin.parseColors(config.getString("no-skill")); String none = MythicLib.plugin.parseColors(config.getString("no-skill"));
RegisteredSkill skill = inv.getPlayerData().hasSkillBound(n) ? inv.getPlayerData().getBoundSkill(n).getSkill() : null; RegisteredSkill skill = inv.getPlayerData().hasSkillBound(n+1) ? inv.getPlayerData().getBoundSkill(n+1).getSkill() : null;
holders.register("skill", skill == null ? none : skill.getName()); holders.register("skill", skill == null ? none : skill.getName());
return holders; return holders;
} }
@ -394,7 +395,7 @@ public class SkillList extends EditableInventory {
* binding or unbinding skills. * binding or unbinding skills.
*/ */
if (item.getFunction().equals("slot")) { if (item.getFunction().equals("slot")) {
int index = slotSlots.indexOf(context.getSlot()); int index = slotSlots.indexOf(context.getSlot())+1;
SkillSlot skillSlot=playerData.getProfess().getSkillSlot(index); SkillSlot skillSlot=playerData.getProfess().getSkillSlot(index);
// unbind if there is a current spell. // unbind if there is a current spell.
if (context.getClickType() == ClickType.RIGHT) { if (context.getClickType() == ClickType.RIGHT) {
@ -427,6 +428,7 @@ public class SkillList extends EditableInventory {
player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 2); player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 2);
playerData.bindSkill(index, selected); playerData.bindSkill(index, selected);
Bukkit.broadcastMessage("SKILL BOUND: "+index);
open(); open();
return; return;
} }