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

NoCheatPlus can now prevent Bukkit from blocking fly mods!

Browse Source
This commit is contained in:
NeatMonster 2012-08-18 15:28:30 +02:00
parent 90f16a2799
commit 858f610e79
11 changed files with 655 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin.yml
View File

@ -3,7 +3,7 @@ version: ${project.version}-b${BUILD_NUMBER}
description: ${project.description} description: ${project.description}
author: NeatMonster author: NeatMonster
authors: [Evenprime, asofold] authors: [asofold, Evenprime]
website: ${project.url} website: ${project.url}
main: ${project.groupId}.${project.artifactId} main: ${project.groupId}.${project.artifactId}
@ -112,6 +112,8 @@ permissions:
description: Allow the player to bypass the MorePacketsVehicle check. description: Allow the player to bypass the MorePacketsVehicle check.
nocheatplus.checks.moving.nofall: nocheatplus.checks.moving.nofall:
description: Allow the player to bypass the NoFall check. description: Allow the player to bypass the NoFall check.
nocheatplus.checks.moving.overridebukkit:
description: Allow the overriding of Bukkit to prevent it from blocking fly mods.
nocheatplus.checks.moving.survivalfly: nocheatplus.checks.moving.survivalfly:
description: Allow the player to bypass the SurvivalFly check. description: Allow the player to bypass the SurvivalFly check.
children: children:

55
src/fr/neatmonster/nocheatplus/CustomNetServerHandler.java
View File

@ -1,55 +0,0 @@
package fr.neatmonster.nocheatplus;
import net.minecraft.server.EntityPlayer;
import net.minecraft.server.INetworkManager;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.NetServerHandler;
import net.minecraft.server.Packet10Flying;
import fr.neatmonster.nocheatplus.checks.moving.MovingListener;
/*
* MM'""""'YMM dP M"""""""`YM dP
* M' .mmm. `M 88 M mmmm. M 88
* M MMMMMooM dP dP .d8888b. d8888P .d8888b. 88d8b.d8b. M MMMMM M .d8888b. d8888P
* M MMMMMMMM 88 88 Y8ooooo. 88 88' `88 88'`88'`88 M MMMMM M 88ooood8 88
* M. `MMM' .M 88. .88 88 88 88. .88 88 88 88 M MMMMM M 88. ... 88
* MM. .dM `88888P' `88888P' dP `88888P' dP dP dP M MMMMM M `88888P' dP
* MMMMMMMMMMM MMMMMMMMMMM
*
* MP""""""`MM M""MMMMM""MM dP dP
* M mmmmm..M M MMMMM MM 88 88
* M. `YM .d8888b. 88d888b. dP .dP .d8888b. 88d888b. M `M .d8888b. 88d888b. .d888b88 88 .d8888b. 88d888b.
* MMMMMMM. M 88ooood8 88' `88 88 d8' 88ooood8 88' `88 M MMMMM MM 88' `88 88' `88 88' `88 88 88ooood8 88' `88
* M. .MMM' M 88. ... 88 88 .88' 88. ... 88 M MMMMM MM 88. .88 88 88 88. .88 88 88. ... 88
* Mb. .dM `88888P' dP 8888P' `88888P' dP M MMMMM MM `88888P8 dP dP `88888P8 dP `88888P' dP
* MMMMMMMMMMM MMMMMMMMMMMM
*/
/**
* A custom NetServerHandler used to intercept packets sent by the player.
*/
public class CustomNetServerHandler extends NetServerHandler {
/**
* Instantiates a new custom net server handler.
*
* @param minecraftserver
* the minecraftserver
* @param inetworkmanager
* the inetworkmanager
* @param entityplayer
* the entityplayer
*/
public CustomNetServerHandler(final MinecraftServer minecraftserver, final INetworkManager inetworkmanager,
final EntityPlayer entityplayer) {
super(minecraftserver, inetworkmanager, entityplayer);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet10Flying)
*/
@Override
public void a(final Packet10Flying packet) {
MovingListener.noFall.handlePacket(player, packet);
super.a(packet);
}
}

617
src/fr/neatmonster/nocheatplus/NetServerHandlerProxy.java Normal file
View File

@ -0,0 +1,617 @@
package fr.neatmonster.nocheatplus;
import java.lang.reflect.Field;
import net.minecraft.server.AxisAlignedBB;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.NetServerHandler;
import net.minecraft.server.Packet;
import net.minecraft.server.Packet0KeepAlive;
import net.minecraft.server.Packet101CloseWindow;
import net.minecraft.server.Packet102WindowClick;
import net.minecraft.server.Packet106Transaction;
import net.minecraft.server.Packet107SetCreativeSlot;
import net.minecraft.server.Packet108ButtonClick;
import net.minecraft.server.Packet10Flying;
import net.minecraft.server.Packet130UpdateSign;
import net.minecraft.server.Packet13PlayerLookMove;
import net.minecraft.server.Packet14BlockDig;
import net.minecraft.server.Packet15Place;
import net.minecraft.server.Packet16BlockItemSwitch;
import net.minecraft.server.Packet18ArmAnimation;
import net.minecraft.server.Packet19EntityAction;
import net.minecraft.server.Packet202Abilities;
import net.minecraft.server.Packet203TabComplete;
import net.minecraft.server.Packet204LocaleAndViewDistance;
import net.minecraft.server.Packet205ClientCommand;
import net.minecraft.server.Packet250CustomPayload;
import net.minecraft.server.Packet255KickDisconnect;
import net.minecraft.server.Packet3Chat;
import net.minecraft.server.Packet7UseEntity;
import net.minecraft.server.Packet9Respawn;
import net.minecraft.server.WorldServer;
import org.bukkit.Location;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import fr.neatmonster.nocheatplus.players.Permissions;
/*
* M"""""""`YM dP MP""""""`MM
* M mmmm. M 88 M mmmmm..M
* M MMMMM M .d8888b. d8888P M. `YM .d8888b. 88d888b. dP .dP .d8888b. 88d888b.
* M MMMMM M 88ooood8 88 MMMMMMM. M 88ooood8 88' `88 88 d8' 88ooood8 88' `88
* M MMMMM M 88. ... 88 M. .MMM' M 88. ... 88 88 .88' 88. ... 88
* M MMMMM M `88888P' dP Mb. .dM `88888P' dP 8888P' `88888P' dP
* MMMMMMMMMMM MMMMMMMMMMM
*
* M""MMMMM""MM dP dP MM"""""""`YM
* M MMMMM MM 88 88 MM mmmmm M
* M `M .d8888b. 88d888b. .d888b88 88 .d8888b. 88d888b. M' .M 88d888b. .d8888b. dP. .dP dP dP
* M MMMMM MM 88' `88 88' `88 88' `88 88 88ooood8 88' `88 MM MMMMMMMM 88' `88 88' `88 `8bd8' 88 88
* M MMMMM MM 88. .88 88 88 88. .88 88 88. ... 88 MM MMMMMMMM 88 88. .88 .d88b. 88. .88
* M MMMMM MM `88888P8 dP dP `88888P8 dP `88888P' dP MM MMMMMMMM dP `88888P' dP' `dP `8888P88
* MMMMMMMMMMMM MMMMMMMMMMMM .88
* d8888P
*/
/**
* A proxy used to fix Bukkit preventing players from using fly mods.
*/
public class NetServerHandlerProxy extends NetServerHandler {
/** The default stance of a player. */
private static final double STANCE = 1.6200000047683716D;
private Field hField;
private final MinecraftServer minecraftServer;
private final NetServerHandler netServerHandler;
private double bukkitX = Double.MAX_VALUE;
private double bukkitY = Double.MAX_VALUE;
private double bukkitZ = Double.MAX_VALUE;
private float bukkitPitch = Float.MAX_VALUE;
private float bukkitYaw = Float.MAX_VALUE;
private boolean checkMovement;
private int flying;
private boolean justTeleported = false;
private double vanillaX;
private double vanillaY;
private double vanillaZ;
/**
* Instantiates a new net server handler proxy.
*
* @param minecraftServer
* the minecraft server
* @param netServerHandler
* the net server handler
*/
public NetServerHandlerProxy(final MinecraftServer minecraftServer, final NetServerHandler netServerHandler) {
super(minecraftServer, netServerHandler.networkManager, netServerHandler.player);
this.minecraftServer = minecraftServer;
this.netServerHandler = netServerHandler;
try {
hField = NetServerHandler.class.getDeclaredField("h");
hField.setAccessible(true);
} catch (final Exception e) {
e.printStackTrace();
}
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a()
*/
@Override
public boolean a() {
return netServerHandler.a();
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(double, double, double, float, float)
*/
@Override
public void a(final double x, final double y, final double z, final float yaw, final float pitch) {
netServerHandler.a(x, y, z, yaw, pitch);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet0KeepAlive)
*/
@Override
public void a(final Packet0KeepAlive packet0keepalive) {
netServerHandler.a(packet0keepalive);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet102WindowClick)
*/
@Override
public void a(final Packet102WindowClick packet102windowclick) {
netServerHandler.a(packet102windowclick);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet106Transaction)
*/
@Override
public void a(final Packet106Transaction packet106transaction) {
netServerHandler.a(packet106transaction);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet107SetCreativeSlot)
*/
@Override
public void a(final Packet107SetCreativeSlot packet107setcreativeslot) {
netServerHandler.a(packet107setcreativeslot);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet108ButtonClick)
*/
@Override
public void a(final Packet108ButtonClick packet108buttonclick) {
netServerHandler.a(packet108buttonclick);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet10Flying)
*/
@Override
public void a(final Packet10Flying packet10flying) {
if (player.getBukkitEntity().hasPermission(Permissions.MOVING_OVERRIDEBUKKIT)) {
final WorldServer worldserver = minecraftServer.getWorldServer(player.dimension);
try {
hField.set(netServerHandler, true);
} catch (final Exception e) {
e.printStackTrace();
}
if (!player.viewingCredits) {
double d0;
if (!checkMovement) {
d0 = packet10flying.y - vanillaY;
if (packet10flying.x == vanillaX && d0 * d0 < 0.01D && packet10flying.z == vanillaZ)
checkMovement = true;
}
final Player bPlayer = getPlayer();
final Location from = new Location(bPlayer.getWorld(), bukkitX, bukkitY, bukkitZ, bukkitYaw,
bukkitPitch);
final Location to = bPlayer.getLocation().clone();
if (packet10flying.hasPos && (packet10flying.y != -999.0D || packet10flying.stance != -999.0D)) {
to.setX(packet10flying.x);
to.setY(packet10flying.y);
to.setZ(packet10flying.z);
}
if (packet10flying.hasLook) {
to.setYaw(packet10flying.yaw);
to.setPitch(packet10flying.pitch);
}
final double delta = Math.pow(bukkitX - to.getX(), 2) + Math.pow(bukkitY - to.getY(), 2)
+ Math.pow(bukkitZ - to.getZ(), 2);
final float deltaAngle = Math.abs(bukkitYaw - to.getYaw()) + Math.abs(bukkitPitch - to.getPitch());
if ((delta > 1f / 256 || deltaAngle > 10f) && checkMovement && !player.dead) {
bukkitX = to.getX();
bukkitY = to.getY();
bukkitZ = to.getZ();
bukkitYaw = to.getYaw();
bukkitPitch = to.getPitch();
if (from.getX() != Double.MAX_VALUE) {
final PlayerMoveEvent event = new PlayerMoveEvent(bPlayer, from, to);
minecraftServer.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
netServerHandler.sendPacket(new Packet13PlayerLookMove(from.getX(), from.getY() + STANCE,
from.getY(), from.getZ(), from.getYaw(), from.getPitch(), false));
return;
}
if (!to.equals(event.getTo()) && !event.isCancelled()) {
player.getBukkitEntity().teleport(event.getTo(), PlayerTeleportEvent.TeleportCause.UNKNOWN);
return;
}
if (!from.equals(getPlayer().getLocation()) && justTeleported) {
justTeleported = false;
return;
}
}
}
if (Double.isNaN(packet10flying.x) || Double.isNaN(packet10flying.y) || Double.isNaN(packet10flying.z)
|| Double.isNaN(packet10flying.stance)) {
bPlayer.teleport(bPlayer.getWorld().getSpawnLocation(), PlayerTeleportEvent.TeleportCause.UNKNOWN);
System.err.println(bPlayer.getName()
+ " was caught trying to crash the server with an invalid position.");
bPlayer.kickPlayer("Nope!");
return;
}
if (checkMovement && !player.dead) {
double d1;
double d2;
double d3;
double d4;
if (player.vehicle != null) {
float f = player.yaw;
float f1 = player.pitch;
player.vehicle.V();
d1 = player.locX;
d2 = player.locY;
d3 = player.locZ;
double d5 = 0.0D;
d4 = 0.0D;
if (packet10flying.hasLook) {
f = packet10flying.yaw;
f1 = packet10flying.pitch;
}
if (packet10flying.hasPos && packet10flying.y == -999.0D && packet10flying.stance == -999.0D) {
if (Math.abs(packet10flying.x) > 1 || Math.abs(packet10flying.z) > 1) {
System.err.println(bPlayer.getName()
+ " was caught trying to crash the server with an invalid position.");
bPlayer.kickPlayer("Nope!");
return;
}
d5 = packet10flying.x;
d4 = packet10flying.z;
}
player.onGround = packet10flying.g;
player.g();
player.move(d5, 0.0D, d4);
player.setLocation(d1, d2, d3, f, f1);
player.motX = d5;
player.motZ = d4;
if (player.vehicle != null)
worldserver.vehicleEnteredWorld(player.vehicle, true);
if (player.vehicle != null)
player.vehicle.V();
minecraftServer.getServerConfigurationManager().d(player);
vanillaX = player.locX;
vanillaY = player.locY;
vanillaZ = player.locZ;
worldserver.playerJoinedWorld(player);
return;
}
if (player.isSleeping()) {
player.g();
player.setLocation(vanillaX, vanillaY, vanillaZ, player.yaw, player.pitch);
worldserver.playerJoinedWorld(player);
return;
}
d0 = player.locY;
vanillaX = player.locX;
vanillaY = player.locY;
vanillaZ = player.locZ;
d1 = player.locX;
d2 = player.locY;
d3 = player.locZ;
float f2 = player.yaw;
float f3 = player.pitch;
if (packet10flying.hasPos && packet10flying.y == -999.0D && packet10flying.stance == -999.0D)
packet10flying.hasPos = false;
if (packet10flying.hasPos) {
d1 = packet10flying.x;
d2 = packet10flying.y;
d3 = packet10flying.z;
d4 = packet10flying.stance - packet10flying.y;
if (!player.isSleeping() && (d4 > 1.65D || d4 < 0.1D)) {
disconnect("Illegal stance");
logger.warning(player.name + " had an illegal stance: " + d4);
return;
}
if (Math.abs(packet10flying.x) > 3.2E7D || Math.abs(packet10flying.z) > 3.2E7D) {
disconnect("Illegal position");
return;
}
}
if (packet10flying.hasLook) {
f2 = packet10flying.yaw;
f3 = packet10flying.pitch;
}
player.g();
player.V = 0.0F;
player.setLocation(vanillaX, vanillaY, vanillaZ, f2, f3);
if (!checkMovement)
return;
d4 = d1 - player.locX;
double d6 = d2 - player.locY;
double d7 = d3 - player.locZ;
final float f4 = 0.0625F;
final boolean flag = worldserver.getCubes(player, player.boundingBox.clone().shrink(f4, f4, f4))
.isEmpty();
if (player.onGround && !packet10flying.g && d6 > 0.0D)
player.j(0.2F);
player.move(d4, d6, d7);
player.onGround = packet10flying.g;
player.checkMovement(d4, d6, d7);
final double d12 = d6;
d4 = d1 - player.locX;
d6 = d2 - player.locY;
if (d6 > -0.5D || d6 < 0.5D)
d6 = 0.0D;
d7 = d3 - player.locZ;
player.setLocation(d1, d2, d3, f2, f3);
final boolean flag2 = worldserver.getCubes(player, player.boundingBox.clone().shrink(f4, f4, f4))
.isEmpty();
if (flag && !flag2 && !player.isSleeping()) {
this.a(vanillaX, vanillaY, vanillaZ, f2, f3);
return;
}
final AxisAlignedBB axisalignedbb = player.boundingBox.clone().grow(f4, f4, f4)
.a(0.0D, -0.55D, 0.0D);
if (!minecraftServer.getAllowFlight() && !player.abilities.canFly && !worldserver.c(axisalignedbb)) {
if (d12 >= -0.03125D) {
flying++;
if (flying > 80) {
logger.warning(player.name + " was kicked for floating too long!");
disconnect("Flying is not enabled on this server");
return;
}
}
} else
flying = 0;
player.onGround = packet10flying.g;
minecraftServer.getServerConfigurationManager().d(player);
if (player.itemInWorldManager.isCreative())
return;
player.b(player.locY - d0, packet10flying.g);
}
}
} else
netServerHandler.a(packet10flying);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet130UpdateSign)
*/
@Override
public void a(final Packet130UpdateSign packet130updatesign) {
netServerHandler.a(packet130updatesign);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet14BlockDig)
*/
@Override
public void a(final Packet14BlockDig packet14blockdig) {
netServerHandler.a(packet14blockdig);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet15Place)
*/
@Override
public void a(final Packet15Place packet15place) {
netServerHandler.a(packet15place);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet16BlockItemSwitch)
*/
@Override
public void a(final Packet16BlockItemSwitch packet16blockitemswitch) {
netServerHandler.a(packet16blockitemswitch);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet18ArmAnimation)
*/
@Override
public void a(final Packet18ArmAnimation packet18armanimation) {
netServerHandler.a(packet18armanimation);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet19EntityAction)
*/
@Override
public void a(final Packet19EntityAction packet19entityaction) {
netServerHandler.a(packet19entityaction);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet202Abilities)
*/
@Override
public void a(final Packet202Abilities packet202abilities) {
netServerHandler.a(packet202abilities);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet203TabComplete)
*/
@Override
public void a(final Packet203TabComplete packet203tabcomplete) {
netServerHandler.a(packet203tabcomplete);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet204LocaleAndViewDistance)
*/
@Override
public void a(final Packet204LocaleAndViewDistance packet204localeandviewdistance) {
netServerHandler.a(packet204localeandviewdistance);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet205ClientCommand)
*/
@Override
public void a(final Packet205ClientCommand packet205clientcommand) {
netServerHandler.a(packet205clientcommand);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet250CustomPayload)
*/
@Override
public void a(final Packet250CustomPayload packet250custompayload) {
netServerHandler.a(packet250custompayload);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet255KickDisconnect)
*/
@Override
public void a(final Packet255KickDisconnect packet255kickdisconnect) {
netServerHandler.a(packet255kickdisconnect);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet3Chat)
*/
@Override
public void a(final Packet3Chat packet3chat) {
netServerHandler.a(packet3chat);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet7UseEntity)
*/
@Override
public void a(final Packet7UseEntity packet7useentity) {
netServerHandler.a(packet7useentity);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(net.minecraft.server.Packet9Respawn)
*/
@Override
public void a(final Packet9Respawn packet9respawn) {
netServerHandler.a(packet9respawn);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#a(java.lang.String, java.lang.Object[])
*/
@Override
public void a(final String s, final Object[] aobject) {
netServerHandler.a(s, aobject);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#b()
*/
@Override
public boolean b() {
return netServerHandler.b();
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#chat(java.lang.String, boolean)
*/
@Override
public void chat(final String s, final boolean async) {
netServerHandler.chat(s, async);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#d()
*/
@Override
public void d() {
netServerHandler.d();
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#disconnect(java.lang.String)
*/
@Override
public void disconnect(final String s) {
netServerHandler.disconnect(s);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#getPlayer()
*/
@Override
public CraftPlayer getPlayer() {
return netServerHandler.getPlayer();
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#handleContainerClose(net.minecraft.server.Packet101CloseWindow)
*/
@Override
public void handleContainerClose(final Packet101CloseWindow packet101closewindow) {
netServerHandler.handleContainerClose(packet101closewindow);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#lowPriorityCount()
*/
@Override
public int lowPriorityCount() {
return netServerHandler.lowPriorityCount();
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#onUnhandledPacket(net.minecraft.server.Packet)
*/
@Override
public void onUnhandledPacket(final Packet packet) {
netServerHandler.onUnhandledPacket(packet);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#sendPacket(net.minecraft.server.Packet)
*/
@Override
public void sendPacket(final Packet packet) {
netServerHandler.sendPacket(packet);
}
/* (non-Javadoc)
* @see net.minecraft.server.NetServerHandler#teleport(org.bukkit.Location)
*/
@Override
public void teleport(final Location destination) {
if (player.getBukkitEntity().hasPermission(Permissions.MOVING_OVERRIDEBUKKIT)) {
final double x = bukkitX = vanillaX = destination.getX();
final double y = bukkitY = vanillaY = destination.getY();
final double z = bukkitZ = vanillaZ = destination.getZ();
final float yaw = bukkitYaw = Float.isNaN(destination.getYaw()) ? 0f : destination.getYaw();
final float pitch = bukkitPitch = Float.isNaN(destination.getPitch()) ? 0f : destination.getPitch();
checkMovement = !(justTeleported = true);
player.setLocation(x, y, z, yaw, pitch);
netServerHandler.sendPacket(new Packet13PlayerLookMove(x, y + STANCE, y, z, yaw, pitch, false));
} else
netServerHandler.teleport(destination);
}
}

109
src/fr/neatmonster/nocheatplus/NoCheatPlus.java
View File

@ -1,15 +1,10 @@
package fr.neatmonster.nocheatplus; package fr.neatmonster.nocheatplus;
import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.server.DedicatedServer;
import net.minecraft.server.EntityPlayer; import net.minecraft.server.EntityPlayer;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.NetServerHandler;
import net.minecraft.server.NetworkManager;
import net.minecraft.server.ServerConnection;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.entity.CraftPlayer;
@ -48,6 +43,8 @@ import fr.neatmonster.nocheatplus.utilities.LagMeasureTask;
* This is the main class of NoCheatPlus. The commands, events listeners and tasks are registered here. * This is the main class of NoCheatPlus. The commands, events listeners and tasks are registered here.
*/ */
public class NoCheatPlus extends JavaPlugin implements Listener { public class NoCheatPlus extends JavaPlugin implements Listener {
/** The time it was when NoCheatPlus has been activated. */
public static long time = System.currentTimeMillis(); public static long time = System.currentTimeMillis();
/** The listeners. */ /** The listeners. */
@ -103,12 +100,6 @@ public class NoCheatPlus extends JavaPlugin implements Listener {
// Register the commands handler. // Register the commands handler.
getCommand("nocheatplus").setExecutor(new CommandHandler(this)); getCommand("nocheatplus").setExecutor(new CommandHandler(this));
// Set the NetServerHandler of every player.
for (final Player player : Bukkit.getOnlinePlayers()) {
resetNetServerHandler(player);
updateNetServerHandler(player);
}
// Tell the server administrator that we finished loading NoCheatPlus now. // Tell the server administrator that we finished loading NoCheatPlus now.
System.out.println("[NoCheatPlus] Version " + getDescription().getVersion() + " is enabled."); System.out.println("[NoCheatPlus] Version " + getDescription().getVersion() + " is enabled.");
} }
@ -136,6 +127,14 @@ public class NoCheatPlus extends JavaPlugin implements Listener {
public void onPlayerJoin(final PlayerJoinEvent event) { public void onPlayerJoin(final PlayerJoinEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
// Set the proxy of the player if enabled.
if (ConfigManager.getConfigFile().getBoolean(ConfPaths.MISCELLANEOUS_USEPROXY)) {
final EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
final NetServerHandlerProxy proxy = new NetServerHandlerProxy(MinecraftServer.getServer(),
entityPlayer.netServerHandler);
entityPlayer.netServerHandler = proxy;
}
// Check if we allow all the client mods. // Check if we allow all the client mods.
final boolean allowAll = ConfigManager.getConfigFile().getBoolean(ConfPaths.MISCELLANEOUS_ALLOWCLIENTMODS); final boolean allowAll = ConfigManager.getConfigFile().getBoolean(ConfPaths.MISCELLANEOUS_ALLOWCLIENTMODS);
String message = ""; String message = "";
@ -214,92 +213,4 @@ public class NoCheatPlus extends JavaPlugin implements Listener {
player.sendMessage(message); player.sendMessage(message);
} }
/**
* Setting the net server handler at the earliest possible point.
*
* @param event
* the event
*/
@EventHandler(
priority = EventPriority.LOWEST)
public void onPlayerJoinLowest(final PlayerJoinEvent event) {
// Set the NetServerHandler of the player.
resetNetServerHandler(event.getPlayer());
updateNetServerHandler(event.getPlayer());
}
/**
* Reset the net server handler of the player.
*
* @param player
* the player
* @return true, if needed
*/
private boolean resetNetServerHandler(final Player player) {
final EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
final NetServerHandler oldNSH = entityPlayer.netServerHandler;
if (!(oldNSH instanceof CustomNetServerHandler))
return false;
final DedicatedServer server = (DedicatedServer) MinecraftServer.getServer();
final NetServerHandler newNSH = new NetServerHandler(server, oldNSH.networkManager, entityPlayer);
newNSH.a(player.getLocation().getX(), player.getLocation().getY(), player.getLocation().getZ(), player
.getLocation().getYaw(), player.getLocation().getPitch());
entityPlayer.netServerHandler = newNSH;
setNetServerHandler(server, oldNSH, newNSH);
oldNSH.disconnected = true;
return true;
}
/**
* Sets the net server handler.
*
* @param server
* the server
* @param oldNSH
* the old net server handler
* @param newNSH
* the new net server handler
* @return true, if successful
*/
@SuppressWarnings({"unchecked", "rawtypes"})
private boolean setNetServerHandler(final DedicatedServer server, final NetServerHandler oldNSH,
final NetServerHandler newNSH) {
try {
Field field = NetworkManager.class.getDeclaredField("packetListener");
field.setAccessible(true);
field.set(oldNSH.networkManager, newNSH);
field = ServerConnection.class.getDeclaredField("d");
field.setAccessible(true);
final List handlerList = (List) field.get(server.ac());
handlerList.remove(oldNSH);
handlerList.add(newNSH);
return true;
} catch (final Exception e) {
e.printStackTrace();
}
return false;
}
/**
* Update the net server handler of the player.
*
* @param player
* the player
* @return true, if needed
*/
private boolean updateNetServerHandler(final Player player) {
final EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
final NetServerHandler oldNSH = entityPlayer.netServerHandler;
if (oldNSH instanceof CustomNetServerHandler)
return false;
final DedicatedServer server = (DedicatedServer) MinecraftServer.getServer();
final NetServerHandler newNSH = new CustomNetServerHandler(server, oldNSH.networkManager, entityPlayer);
newNSH.a(player.getLocation().getX(), player.getLocation().getY(), player.getLocation().getZ(), player
.getLocation().getYaw(), player.getLocation().getPitch());
entityPlayer.netServerHandler = newNSH;
setNetServerHandler(server, oldNSH, newNSH);
oldNSH.disconnected = true;
return true;
}
} }

17
src/fr/neatmonster/nocheatplus/checks/moving/MovingData.java
View File

@ -84,11 +84,8 @@ public class MovingData implements CheckData {
// Data of the no fall check. // Data of the no fall check.
public double noFallFallDistance; public double noFallFallDistance;
public double noFallNewFallDistance; public boolean noFallOnGround;
public boolean noFallOnGroundClient; public boolean noFallWasOnGround;
public boolean noFallOnGroundServer;
public boolean noFallWasOnGroundClient;
public boolean noFallWasOnGroundServer;
// Data of the survival fly check. // Data of the survival fly check.
public int survivalFlyJumpPhase; public int survivalFlyJumpPhase;
@ -108,9 +105,9 @@ public class MovingData implements CheckData {
public void clearFlyData() { public void clearFlyData() {
bunnyhopDelay = 0; bunnyhopDelay = 0;
noFallFallDistance = 0D; noFallFallDistance = 0D;
noFallOnGroundClient = noFallOnGroundServer = noFallWasOnGroundClient = noFallWasOnGroundServer = true;
survivalFlyJumpPhase = 0; survivalFlyJumpPhase = 0;
setBack = null; setBack = null;
clearNoFallData();
} }
/** /**
@ -121,7 +118,11 @@ public class MovingData implements CheckData {
morePacketsVehicleSetback = null; morePacketsVehicleSetback = null;
} }
public void resetNoFallDistances() { /**
noFallFallDistance = noFallNewFallDistance = 0D; * Clear the data of the new fall check.
*/
public void clearNoFallData() {
noFallOnGround = noFallWasOnGround = true;
noFallFallDistance = 0D;
} }
} }

9
src/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
View File

@ -200,7 +200,6 @@ public class MovingListener implements Listener {
data.teleported = null; data.teleported = null;
data.clearFlyData(); data.clearFlyData();
data.clearMorePacketsData(); data.clearMorePacketsData();
data.resetNoFallDistances();
} }
/** /**
@ -229,7 +228,6 @@ public class MovingListener implements Listener {
final MovingData data = MovingData.getData(event.getPlayer()); final MovingData data = MovingData.getData(event.getPlayer());
data.clearFlyData(); data.clearFlyData();
data.clearMorePacketsData(); data.clearMorePacketsData();
data.resetNoFallDistances();
} }
/** /**
@ -354,11 +352,9 @@ public class MovingListener implements Listener {
// If don't have a new location and if he is handled by the no fall check, execute it. // If don't have a new location and if he is handled by the no fall check, execute it.
if (newTo == null && noFall.isEnabled(player)) if (newTo == null && noFall.isEnabled(player))
noFall.check(player, from, to); noFall.check(player, from, to);
} else { } else
// He isn't handled by any fly check, clear his data. // He isn't handled by any fly check, clear his data.
data.clearFlyData(); data.clearFlyData();
data.resetNoFallDistances();
}
if (newTo == null && morePackets.isEnabled(player)) if (newTo == null && morePackets.isEnabled(player))
// If he hasn't been stopped by any other check and is handled by the more packets check, execute it. // If he hasn't been stopped by any other check and is handled by the more packets check, execute it.
@ -396,7 +392,6 @@ public class MovingListener implements Listener {
final MovingData data = MovingData.getData(event.getPlayer()); final MovingData data = MovingData.getData(event.getPlayer());
data.clearFlyData(); data.clearFlyData();
data.clearMorePacketsData(); data.clearMorePacketsData();
data.resetNoFallDistances();
} }
/** /**
@ -419,7 +414,6 @@ public class MovingListener implements Listener {
final MovingData data = MovingData.getData(event.getPlayer()); final MovingData data = MovingData.getData(event.getPlayer());
data.clearFlyData(); data.clearFlyData();
data.clearMorePacketsData(); data.clearMorePacketsData();
data.resetNoFallDistances();
} }
/** /**
@ -457,7 +451,6 @@ public class MovingListener implements Listener {
// Always drop data from fly checks, as it always loses its validity after teleports. Always! // Always drop data from fly checks, as it always loses its validity after teleports. Always!
data.teleported = null; data.teleported = null;
data.clearFlyData(); data.clearFlyData();
data.resetNoFallDistances();
} }
/** /**

57
src/fr/neatmonster/nocheatplus/checks/moving/NoFall.java
View File

@ -2,10 +2,7 @@ package fr.neatmonster.nocheatplus.checks.moving;
import java.util.Locale; import java.util.Locale;
import net.minecraft.server.AxisAlignedBB;
import net.minecraft.server.DamageSource;
import net.minecraft.server.EntityPlayer; import net.minecraft.server.EntityPlayer;
import net.minecraft.server.Packet10Flying;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -51,28 +48,15 @@ public class NoFall extends Check {
final MovingConfig cc = MovingConfig.getConfig(player); final MovingConfig cc = MovingConfig.getConfig(player);
final MovingData data = MovingData.getData(player); final MovingData data = MovingData.getData(player);
data.noFallWasOnGround = data.noFallOnGround;
data.noFallOnGround = to.isOnGround();
// If the player is on the ground, is falling into a liquid, in web or is on a ladder. // If the player is on the ground, is falling into a liquid, in web or is on a ladder.
if (from.isOnGround() && to.isOnGround() || to.isInLiquid() || to.isInWeb() || to.isOnLadder()) if (from.isOnGround() && to.isOnGround() || to.isInLiquid() || to.isInWeb() || to.isOnLadder())
data.resetNoFallDistances(); data.noFallFallDistance = 0D;
// If the player just touched the ground for the server, but no for the client.
if (!data.noFallWasOnGroundServer && data.noFallOnGroundServer
&& (data.noFallWasOnGroundClient || !data.noFallOnGroundClient)) {
// Calculate the fall damages to be dealt.
final int fallDamage = (int) data.noFallFallDistance - 2;
if (fallDamage > 0) {
// Add the fall distance to the violation level.
data.noFallVL += data.noFallFallDistance;
// Execute the actions to find out if we need to cancel the event or not.
if (executeActions(player, data.noFallVL, cc.noFallActions))
// Calling this method will send the event for us.
((CraftPlayer) player).getHandle().damageEntity(DamageSource.FALL, fallDamage);
}
}
// If the player just touched the ground for the server. // If the player just touched the ground for the server.
else if (!data.noFallWasOnGroundServer && data.noFallOnGroundServer) { if (!data.noFallWasOnGround && data.noFallOnGround) {
// If the difference between the fall distance recorded by Bukkit and NoCheatPlus is too big and the fall // If the difference between the fall distance recorded by Bukkit and NoCheatPlus is too big and the fall
// distance bigger than 2. // distance bigger than 2.
if (data.noFallFallDistance - player.getFallDistance() > 0.1D && (int) data.noFallFallDistance > 2) { if (data.noFallFallDistance - player.getFallDistance() > 0.1D && (int) data.noFallFallDistance > 2) {
@ -91,9 +75,12 @@ public class NoFall extends Check {
data.noFallVL *= 0.95D; data.noFallVL *= 0.95D;
// The player has touched the ground somewhere, reset his fall distance. // The player has touched the ground somewhere, reset his fall distance.
if (!data.noFallWasOnGroundServer && data.noFallOnGroundServer || data.noFallWasOnGroundServer if (!data.noFallWasOnGround && data.noFallOnGround || data.noFallWasOnGround && !data.noFallOnGround)
&& !data.noFallOnGroundServer) data.noFallFallDistance = 0D;
data.resetNoFallDistances();
final EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle();
if (to.getY() > 0 && entityPlayer.locY > to.getY())
data.noFallFallDistance += entityPlayer.locY - to.getY();
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -107,26 +94,4 @@ public class NoFall extends Check {
else else
return super.getParameter(wildcard, violationData); return super.getParameter(wildcard, violationData);
} }
/**
* Handle a movement packet to extract its precious information.
*
* @param player
* the player
* @param packet
* the packet
*/
public void handlePacket(final EntityPlayer player, final Packet10Flying packet) {
final MovingData data = MovingData.getData(player.getBukkitEntity());
data.noFallWasOnGroundClient = data.noFallOnGroundClient;
data.noFallWasOnGroundServer = data.noFallOnGroundServer;
data.noFallOnGroundClient = packet.g;
final AxisAlignedBB boundingBoxGround = player.boundingBox.clone().d(packet.x - player.locX,
packet.y - player.locY - 0.001D, packet.z - player.locZ);
data.noFallOnGroundServer = player.world.getCubes(player, boundingBoxGround).size() > 0;
if (packet.hasPos && packet.y > 0 && player.locY - packet.y > 0D) {
data.noFallFallDistance = data.noFallNewFallDistance;
data.noFallNewFallDistance += player.locY - packet.y;
}
}
} }

2
src/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
View File

@ -179,7 +179,7 @@ public class SurvivalFly extends Check {
data.setBack.setY(Math.floor(data.setBack.getY())); data.setBack.setY(Math.floor(data.setBack.getY()));
data.survivalFlyJumpPhase = 0; data.survivalFlyJumpPhase = 0;
// Reset the no fall data. // Reset the no fall data.
data.resetNoFallDistances(); data.clearNoFallData();
} }
data.survivalFlyLastFromY = from.getY(); data.survivalFlyLastFromY = from.getY();

1
src/fr/neatmonster/nocheatplus/config/ConfPaths.java
View File

@ -41,6 +41,7 @@ public abstract class ConfPaths {
public static final String MISCELLANEOUS_ALLOWCLIENTMODS = MISCELLANEOUS + "allowclientmods"; public static final String MISCELLANEOUS_ALLOWCLIENTMODS = MISCELLANEOUS + "allowclientmods";
public static final String MISCELLANEOUS_OPINCONSOLEONLY = MISCELLANEOUS + "opinconsoleonly"; public static final String MISCELLANEOUS_OPINCONSOLEONLY = MISCELLANEOUS + "opinconsoleonly";
public static final String MISCELLANEOUS_PROTECTPLUGINS = MISCELLANEOUS + "protectplugins"; public static final String MISCELLANEOUS_PROTECTPLUGINS = MISCELLANEOUS + "protectplugins";
public static final String MISCELLANEOUS_USEPROXY = MISCELLANEOUS + "useproxy";
private static final String CHECKS = "checks."; private static final String CHECKS = "checks.";

1
src/fr/neatmonster/nocheatplus/config/DefaultConfig.java
View File

@ -51,6 +51,7 @@ public class DefaultConfig extends ConfigFile {
set(ConfPaths.MISCELLANEOUS_ALLOWCLIENTMODS, false); set(ConfPaths.MISCELLANEOUS_ALLOWCLIENTMODS, false);
set(ConfPaths.MISCELLANEOUS_OPINCONSOLEONLY, false); set(ConfPaths.MISCELLANEOUS_OPINCONSOLEONLY, false);
set(ConfPaths.MISCELLANEOUS_PROTECTPLUGINS, true); set(ConfPaths.MISCELLANEOUS_PROTECTPLUGINS, true);
set(ConfPaths.MISCELLANEOUS_USEPROXY, true);
/* /*
* 888 88b, 888 888 888 88b, 888 * 888 88b, 888 888 888 88b, 888

1
src/fr/neatmonster/nocheatplus/players/Permissions.java
View File

@ -127,6 +127,7 @@ public class Permissions {
public static final String MOVING_MOREPACKETS = MOVING + ".morepackets"; public static final String MOVING_MOREPACKETS = MOVING + ".morepackets";
public static final String MOVING_MOREPACKETSVEHICLE = MOVING + ".morepacketsvehicle"; public static final String MOVING_MOREPACKETSVEHICLE = MOVING + ".morepacketsvehicle";
public static final String MOVING_NOFALL = MOVING + ".nofall"; public static final String MOVING_NOFALL = MOVING + ".nofall";
public static final String MOVING_OVERRIDEBUKKIT = MOVING + ".overridebukkit";
public static final String MOVING_SURVIVALFLY = MOVING + ".survivalfly"; public static final String MOVING_SURVIVALFLY = MOVING + ".survivalfly";
public static final String MOVING_SURVIVALFLY_BLOCKING = MOVING_SURVIVALFLY + ".blocking"; public static final String MOVING_SURVIVALFLY_BLOCKING = MOVING_SURVIVALFLY + ".blocking";
public static final String MOVING_SURVIVALFLY_SNEAKING = MOVING_SURVIVALFLY + ".sneaking"; public static final String MOVING_SURVIVALFLY_SNEAKING = MOVING_SURVIVALFLY + ".sneaking";