Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-29 23:17:41 +02:00
Code Issues Projects Releases Wiki Activity

Fix pre-horse.

Browse Source
This commit is contained in:
asofold 2017-04-07 22:17:59 +02:00
parent 464e374c10
commit 1b79889dd4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/vehicle/VehicleEnvelope.java
View File

@ -20,7 +20,6 @@ import java.util.List;
import org.bukkit.entity.Boat; import org.bukkit.entity.Boat;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.entity.Pig; import org.bukkit.entity.Pig;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -100,7 +99,7 @@ public class VehicleEnvelope extends Check {
public VehicleEnvelope() { public VehicleEnvelope() {
super(CheckType.MOVING_VEHICLE_ENVELOPE); super(CheckType.MOVING_VEHICLE_ENVELOPE);
Class<?> clazz = ReflectionUtil.getClass("org.bukkit.entity.AbstractHorse"); Class<?> clazz = ReflectionUtil.getClass("org.bukkit.entity.AbstractHorse");
bestHorse = clazz == null ? Horse.class : clazz; bestHorse = clazz == null ? ReflectionUtil.getClass("org.bukkit.entity.Horse") : clazz;
} }
public SetBackEntry check(final Player player, final Entity vehicle, final VehicleMoveData thisMove, final boolean isFake, final MovingData data, final MovingConfig cc) { public SetBackEntry check(final Player player, final Entity vehicle, final VehicleMoveData thisMove, final boolean isFake, final MovingData data, final MovingConfig cc) {
@ -331,7 +330,7 @@ public class VehicleEnvelope extends Check {
} }
checkDetails.gravityTargetSpeed = 0.79; checkDetails.gravityTargetSpeed = 0.79;
} }
else if (bestHorse.isAssignableFrom(vehicle.getClass())) { else if (bestHorse != null && bestHorse.isAssignableFrom(vehicle.getClass())) {
// TODO: Climbable? -> seems not. // TODO: Climbable? -> seems not.
checkDetails.simplifiedType = EntityType.HORSE; // TODO: 1.11 - Use AbstractHorse? checkDetails.simplifiedType = EntityType.HORSE; // TODO: 1.11 - Use AbstractHorse?
checkDetails.canJump = checkDetails.canStepUpBlock = true; checkDetails.canJump = checkDetails.canStepUpBlock = true;