Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix elytra model not being used when in creative mode. 

Levitation will now apply when a player is in creative but not flying -
trial and error!
This commit is contained in:
asofold 2017-05-03 11:44:25 +02:00
parent 73f420527c
commit e852fb03d2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java
View File

@ -442,27 +442,27 @@ public class MovingConfig extends ACheckConfig {
switch(gameMode) {
case SURVIVAL:
case ADVENTURE:
// Check for jetpack/potion first.
case CREATIVE:
// Specific checks.
break;
default:
return modelGameMode;
}
// TODO: Short touch of water/vines (/ground?) is possible - use past moves or in-medium-count.
final boolean isGlidingWithElytra = Bridge1_9.isGlidingWithElytra(player);
if (player.isFlying()
|| !isGlidingWithElytra && !ignoreAllowFlight && player.getAllowFlight()) {
if (player.isFlying() || !isGlidingWithElytra && !ignoreAllowFlight && player.getAllowFlight()) {
return modelGameMode;
}
// TODO: ORDER IS RANDOM GUESSING. Is mixtures possible?
if (fromLocation.isInLiquid()) {
// TODO: INCONSISTENT.
// TODO: INCONSISTENT. Check in medium count / past moves.
return modelGameMode;
}
if (!Double.isInfinite(Bridge1_9.getLevitationAmplifier(player))) {
if (gameMode != GameMode.CREATIVE && !Double.isInfinite(Bridge1_9.getLevitationAmplifier(player))) {
return flyingModelLevitation;
}
if (fromLocation.isOnGroundOrResetCond()) {
// TODO: INCONSISTENT.
// TODO: INCONSISTENT. Check in medium count / past moves.
return modelGameMode;
}
if (isGlidingWithElytra) { // Defensive: don't demand isGliding.