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

Fixed an issue with perm drop table condition

Browse Source
This commit is contained in:
Indyuce 2021-08-20 17:52:25 +02:00
parent 8525a1c56d
commit d5d75fe697
2 changed files with 3 additions and 8 deletions
src/main/java/net/Indyuce/mmocore
api/droptable/condition
PermissionCondition.java
comp/mythicmobs/skill
MythicMobSkill.java

5
src/main/java/net/Indyuce/mmocore/api/droptable/condition/PermissionCondition.java
View File

@ -1,8 +1,7 @@
package net.Indyuce.mmocore.api.droptable.condition; package net.Indyuce.mmocore.api.droptable.condition;
import org.bukkit.entity.Player;
import io.lumine.mythic.lib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
import org.bukkit.entity.Player;
public class PermissionCondition extends Condition { public class PermissionCondition extends Condition {
private final String perm; private final String perm;
@ -17,7 +16,7 @@ public class PermissionCondition extends Condition {
@Override @Override
public boolean isMet(ConditionInstance entity) { public boolean isMet(ConditionInstance entity) {
if (entity.getEntity() instanceof Player) if (entity.getEntity() instanceof Player)
return ((Player) entity).hasPermission(perm); return entity.getEntity().hasPermission(perm);
return false; return false;
} }
} }

6
src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/MythicMobSkill.java
View File

@ -75,10 +75,6 @@ public class MythicMobSkill extends Skill {
return antiCheat; return antiCheat;
} }
public String getInternalName() {
return skill.getInternalName();
}
public io.lumine.xikage.mythicmobs.skills.Skill getSkill() { public io.lumine.xikage.mythicmobs.skills.Skill getSkill() {
return skill; return skill;
} }
@ -94,7 +90,7 @@ public class MythicMobSkill extends Skill {
AbstractEntity trigger = BukkitAdapter.adapt(caster.getPlayer()); AbstractEntity trigger = BukkitAdapter.adapt(caster.getPlayer());
SkillCaster skillCaster = new GenericCaster(trigger); SkillCaster skillCaster = new GenericCaster(trigger);
io.lumine.xikage.mythicmobs.skills.SkillMetadata skillMeta = new io.lumine.xikage.mythicmobs.skills.SkillMetadata(SkillTrigger.API, skillCaster, trigger, BukkitAdapter.adapt(caster.getPlayer().getEyeLocation()), targetEntities, targetLocations, 1); io.lumine.xikage.mythicmobs.skills.SkillMetadata skillMeta = new io.lumine.xikage.mythicmobs.skills.SkillMetadata(SkillTrigger.API, skillCaster, trigger, BukkitAdapter.adapt(caster.getPlayer().getLocation()), targetEntities, targetLocations, 1);
// Disable anticheat // Disable anticheat
if (MMOCore.plugin.hasAntiCheat()) if (MMOCore.plugin.hasAntiCheat())