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

There's a reason we test code. Thanks, hobbit!

This commit is contained in:
Ali Moghnieh 2016-07-12 00:46:08 +01:00
parent 0ab9f04ea4
commit 79401c3cf7
No known key found for this signature in database
GPG Key ID: F09D3A1BAF2E6D70
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Essentials/src/com/earth2me/essentials/User.java
View File

@ -554,10 +554,9 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
// This enables the no-god-in-worlds functionality where the actual player god mode state is never modified in disabled worlds,
// but this method gets called every time the player takes damage. In the case that the world has god-mode disabled then this method
// will return false and the player will take damage, even though they are in god mode (isGodModeEnabledRaw()).
if (ess.getSettings().getNoGodWorlds().contains(this.getLocation().getWorld().getName())) {
return false;
if (!ess.getSettings().getNoGodWorlds().contains(this.getLocation().getWorld().getName())) {
return true;
}
return true;
}
if (isAfk()) {
// Protect AFK players by representing them in a god mode state to render them invulnerable to damage.