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

Fixed a 1.12 compatibility issue with ray traces

Browse Source
This commit is contained in:
Indyuce 2020-03-19 13:38:57 +01:00
parent df52b2c679
commit 8417ca60ca
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/Indyuce/mmocore/api/skill/TargetSkillResult.java
View File

@ -1,11 +1,12 @@
package net.Indyuce.mmocore.api.skill; package net.Indyuce.mmocore.api.skill;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.util.RayTraceResult;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.skill.Skill.SkillInfo; import net.Indyuce.mmocore.api.skill.Skill.SkillInfo;
import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.MMOCoreUtils;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.MMORayTraceResult;
public class TargetSkillResult extends SkillResult { public class TargetSkillResult extends SkillResult {
private LivingEntity target; private LivingEntity target;
@ -14,11 +15,11 @@ public class TargetSkillResult extends SkillResult {
super(data, skill); super(data, skill);
if (isSuccessful()) { if (isSuccessful()) {
RayTraceResult result = data.getPlayer().getWorld().rayTraceEntities(data.getPlayer().getEyeLocation(), data.getPlayer().getEyeLocation().getDirection(), range, entity -> MMOCoreUtils.canTarget(data.getPlayer(), entity)); MMORayTraceResult result = MMOLib.plugin.getVersion().getWrapper().rayTrace(data.getPlayer(), range, entity -> MMOCoreUtils.canTarget(data.getPlayer(), entity));
if (result == null) if (!result.hasHit())
abort(CancelReason.OTHER); abort(CancelReason.OTHER);
else else
target = (LivingEntity) result.getHitEntity(); target = (LivingEntity) result.getHit();
} }
} }