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

Correction for dmaage: count in creative + use damage set by event.

Browse Source
This commit is contained in:
asofold 2012-08-12 06:55:57 +02:00
parent 78f48b925f
commit d870e0452e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import net.minecraft.server.EntityPlayer;
import net.minecraft.server.Packet10Flying;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
@ -78,9 +79,11 @@ public class NoFall extends Check {
if (executeActions(player, data.noFallVL, cc.noFallActions)){
// Deal the fall damages to the player.
// TODO: set accurate fall damage (feather falling etc).
final NoFallDamageEvent damageEvent = new NoFallDamageEvent(player, DamageCause.FALL, fallDamage);
Bukkit.getPluginManager().callEvent(damageEvent);
if (!damageEvent.isCancelled()) player.damage(fallDamage);
if (player.getGameMode() != GameMode.CREATIVE){
final NoFallDamageEvent damageEvent = new NoFallDamageEvent(player, DamageCause.FALL, fallDamage);
Bukkit.getPluginManager().callEvent(damageEvent);
if (!damageEvent.isCancelled()) player.damage(damageEvent.getDamage());
}
data.noFallFallDistance = 0.0;
player.setFallDistance(0.0f);
}