Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-02-05 14:21:39 +01:00
Code Issues Projects Releases Wiki Activity

Now config.yml hunger totally disables hunger permission

Browse Source
This commit is contained in:
Fabrizio La Rosa 2020-06-16 21:43:42 +02:00
parent b181babdd4
commit 1fe0777645
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/songoda/skyblock/SkyBlock.java
View File

@ -111,8 +111,8 @@ public class SkyBlock extends SongodaPlugin {
// Load Holograms
com.songoda.core.hooks.HologramManager.load(this);
permissionManager = new PermissionManager(this);
fileManager = new FileManager(this);
permissionManager = new PermissionManager(this);
localizationManager = new LocalizationManager();
worldManager = new WorldManager(this);
userCacheManager = new UserCacheManager(this);

9
src/main/java/com/songoda/skyblock/permission/BasicPermission.java
View File

@ -60,15 +60,6 @@ public abstract class BasicPermission {
return is;
}
/**
* Use this to check additional perms.
*
* @return
*/
public boolean overridingCheck() {
return true;
}
public String getName() {
return name;
}

11
src/main/java/com/songoda/skyblock/permission/PermissionManager.java
View File

@ -11,6 +11,7 @@ import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.*;
@ -27,7 +28,7 @@ public class PermissionManager {
this.plugin = plugin;
// Load default permissions.
registerPermissions(
registerPermissions( // TODO Reload them with /is admin reload - Fabrimat
//Listening
new StoragePermission(plugin),
new DragonEggUsePermission(plugin),
@ -77,7 +78,6 @@ public class PermissionManager {
new MobGriefingPermission(plugin),
new ExperienceOrbPickupPermission(plugin),
new NaturalMobSpawningPermission(),
new HungerPermission(plugin),
new PortalPermission(plugin),
new ItemPickupPermission(),
new ItemDropPermission(),
@ -100,6 +100,11 @@ public class PermissionManager {
new MainSpawnPermission(),
new VisitorSpawnPermission());
if(plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable")){
registerPermission(new HungerPermission(plugin));
}
registeredHandlers = registeredHandlers.stream().sorted(Comparator.comparingInt(h -> {
final PermissionHandler permissionHandler = h.getHandler().getAnnotation(PermissionHandler.class);
return permissionHandler.priority().ordinal();
@ -152,7 +157,7 @@ public class PermissionManager {
BasicPermission permission = wrapper.getPermission();
if (permission.overridingCheck() && hasPermission(player, island, permission))
if (hasPermission(player, island, permission))
continue;
try {

6
src/main/java/com/songoda/skyblock/permission/permissions/listening/HungerPermission.java
View File

@ -21,12 +21,6 @@ public class HungerPermission extends ListeningPermission {
this.messageManager = plugin.getMessageManager();
}
@Override
public boolean overridingCheck() {
return plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml"))
.getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable");
}
@PermissionHandler
public void onFoodLevelChange(FoodLevelChangeEvent event) {
event.setCancelled(true);