TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 11:49:12 +00:00
Code Issues Projects Releases Wiki Activity

Document no-god-in-worlds feature usage in code.

Browse source
This commit is contained in:
Ali Moghnieh 2016-07-12 00:03:08 +01:00
parent 04f14285e7
commit 0ab9f04ea4
No known key found for this signature in database
GPG key ID: F09D3A1BAF2E6D70
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -484,6 +484,8 @@ public class EssentialsPlayerListener implements Listener {
user.setDisplayNick();
updateCompass(user);
if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw()) {
// Player god mode is never disabled in order to retain it when changing worlds once more.
// With that said, players will still take damage as per the result of User#isGodModeEnabled()
user.sendMessage(tl("noGodWorldWarning"));
}

17
Essentials/src/com/earth2me/essentials/User.java
View file

@ -550,7 +550,22 @@ public class User extends UserData implements Comparable<User>, IMessageRecipien
@Override
public boolean isGodModeEnabled() {
return (super.isGodModeEnabled() && !ess.getSettings().getNoGodWorlds().contains(this.getLocation().getWorld().getName())) || (isAfk() && ess.getSettings().getFreezeAfkPlayers());
if (super.isGodModeEnabled()) {
// 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;
}
return true;
}
if (isAfk()) {
// Protect AFK players by representing them in a god mode state to render them invulnerable to damage.
if (ess.getSettings().getFreezeAfkPlayers()) {
return true;
}
}
return false;
}
public boolean isGodModeEnabledRaw() {