Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-07 11:10:05 +01:00
Code Issues Projects Releases Wiki Activity

Log in survivalfly, if the player is wearing elytra, but no end rod.

Browse Source
This commit is contained in:
asofold 2016-03-20 11:42:16 +01:00
parent ff12a15c97
commit 56f217c9f2
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
View File

@ -22,6 +22,7 @@ import fr.neatmonster.nocheatplus.checks.moving.magic.MagicLiquid;
import fr.neatmonster.nocheatplus.checks.moving.model.LiftOffEnvelope;
import fr.neatmonster.nocheatplus.checks.moving.model.MoveData;
import fr.neatmonster.nocheatplus.checks.workaround.WRPT;
import fr.neatmonster.nocheatplus.compat.Bridge1_9;
import fr.neatmonster.nocheatplus.compat.BridgeEnchant;
import fr.neatmonster.nocheatplus.compat.blocks.BlockChangeTracker;
import fr.neatmonster.nocheatplus.compat.blocks.BlockChangeTracker.Direction;
@ -2205,6 +2206,9 @@ public class SurvivalFly extends Check {
// Exception: does not take into account latency.
tags.add("lowfoodsprint");
}
if (Bridge1_9.isWearingElytra(player)) {
tags.add("elytra_off");
}
if (!tags.isEmpty()) {
builder.append("\n" + " tags: " + StringUtil.join(tags, "+"));
}

24
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/Bridge1_9.java
View File

@ -58,20 +58,20 @@ public class Bridge1_9 {
* @return
*/
public static boolean isReadyForElytra(final Player player) {
// TODO: Off-hand testing needs to be supported, pass an instance for access.
// TODO: Generic jet-pack / potion support (triggers + model configs).
if (END_ROD == null || ELYTRA == null) {
return false;
return END_ROD != null && ELYTRA != null && isWearingElytra(player) && hasItemInAnyHand(player, END_ROD);
}
ItemStack stack = player.getInventory().getChestplate();
if (stack == null || stack.getType() != ELYTRA) {
return false;
}
if (!hasItemInAnyHand(player, END_ROD)) {
return false;
}
// Possible to use elytra.
return true;
/**
* Just test if the player has elytra equipped in the chest plate slot. The
* player may or may not be holding an end rod in either hand.
*
* @param player
* @return
*/
public static boolean isWearingElytra(final Player player) {
final ItemStack stack = player.getInventory().getChestplate();
return stack != null && stack.getType() == ELYTRA;
}
/**