Temporarily disable some things

This commit is contained in:
ZeroEpoch1969 2018-07-23 23:54:19 -07:00
parent cae068a151
commit ebb05fa6a6
No known key found for this signature in database
GPG Key ID: A7BAB4E14F089CF3
8 changed files with 44 additions and 15 deletions

View File

@ -91,5 +91,6 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" name="commodore" level="project" />
</component> </component>
</module> </module>

View File

@ -225,9 +225,10 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
btb = bridges.registerService(BukkitTelnetBridge.class); btb = bridges.registerService(BukkitTelnetBridge.class);
cpb = bridges.registerService(CoreProtectBridge.class); cpb = bridges.registerService(CoreProtectBridge.class);
esb = bridges.registerService(EssentialsBridge.class); esb = bridges.registerService(EssentialsBridge.class);
ldb = bridges.registerService(LibsDisguisesBridge.class); // Disabled so I can at least load TFM as these plugins aren't updated
web = bridges.registerService(WorldEditBridge.class); //ldb = bridges.registerService(LibsDisguisesBridge.class);
wgb = bridges.registerService(WorldGuardBridge.class); //web = bridges.registerService(WorldEditBridge.class);
//wgb = bridges.registerService(WorldGuardBridge.class);
amp = bridges.registerService(AMP.class); amp = bridges.registerService(AMP.class);
bridges.start(); bridges.start();

View File

@ -57,10 +57,10 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
private String acFormat = null; private String acFormat = null;
@Getter @Getter
@Setter @Setter
private Boolean oldTags = null; private Boolean oldTags = false;
@Getter @Getter
@Setter @Setter
private Boolean logStick = null; private Boolean logStick = false;
public static final String CONFIG_FILENAME = "admins.yml"; public static final String CONFIG_FILENAME = "admins.yml";

View File

@ -113,6 +113,17 @@ public class AdminList extends FreedomService
config.save(); config.save();
} }
public void messageAllAdmins(String message)
{
for (Player player : server.getOnlinePlayers())
{
if (isAdmin(player))
{
player.sendMessage(message);
}
}
}
public synchronized boolean isAdminSync(CommandSender sender) public synchronized boolean isAdminSync(CommandSender sender)
{ {
return isAdmin(sender); return isAdmin(sender);

View File

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH, blockHostConsole = true) @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
@CommandParameters(description = "Warns a player.", usage = "/<command> <player> <reason>") @CommandParameters(description = "Warns a player.", usage = "/<command> <player> <reason>")
public class Command_warn extends FreedomCommand public class Command_warn extends FreedomCommand
{ {
@ -48,6 +48,16 @@ public class Command_warn extends FreedomCommand
msg(player, ChatColor.RED + "[WARNING] You received a warning: " + warnReason); msg(player, ChatColor.RED + "[WARNING] You received a warning: " + warnReason);
msg(ChatColor.GREEN + "You have successfully warned " + player.getName()); msg(ChatColor.GREEN + "You have successfully warned " + player.getName());
final StringBuilder adminNotice = new StringBuilder()
.append(ChatColor.RED)
.append(sender.getName())
.append(" - ")
.append("Warning: ")
.append(player.getName())
.append(" - Reason: ")
.append(ChatColor.YELLOW)
.append(warnReason);
plugin.al.messageAllAdmins(adminNotice.toString());
plugin.pl.getPlayer(player).incrementWarnings(); plugin.pl.getPlayer(player).incrementWarnings();

View File

@ -36,9 +36,10 @@ public class WorldManager extends FreedomService
@Override @Override
protected void onStart() protected void onStart()
{ {
flatlands.getWorld(); // Disabled temporarily
adminworld.getWorld(); //flatlands.getWorld();
masterBuilderWorld.getWorld(); //adminworld.getWorld();
//masterBuilderWorld.getWorld();
// Disable weather // Disable weather
if (ConfigEntry.DISABLE_WEATHER.getBoolean()) if (ConfigEntry.DISABLE_WEATHER.getBoolean())
@ -56,9 +57,9 @@ public class WorldManager extends FreedomService
@Override @Override
protected void onStop() protected void onStop()
{ {
flatlands.getWorld().save(); //flatlands.getWorld().save();
adminworld.getWorld().save(); //adminworld.getWorld().save();
masterBuilderWorld.getWorld().save(); //masterBuilderWorld.getWorld().save();
} }
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)

View File

@ -140,8 +140,11 @@ blocked_commands:
- 'n:b:/pp hugeexplosion:You may not use this particle! Please use another.' - 'n:b:/pp hugeexplosion:You may not use this particle! Please use another.'
- 'n:b:/pp barrier:You may not use this particle! Please use another.' - 'n:b:/pp barrier:You may not use this particle! Please use another.'
- 'n:b:/setjail:_' - 'n:b:/setjail:_'
- 'n:b:/tfbanlist:Use /banlist to see and wipe the ban list' - 'n:b:/function:_'
- 'n:b:/tfipbanlist:Use /banlist to see and wipe the ban list' - 'n:b:/defaultgamemode:_'
- 'n:b:/data:_'
- 'n:b:/datapack:_'
- 'n:b:/tag:_'
# Superadmin commands # Superadmin commands
- 's:b:/save-all:_' - 's:b:/save-all:_'
@ -180,6 +183,8 @@ blocked_commands:
- 's:b:/togglejail:_' - 's:b:/togglejail:_'
- 's:b:/fill:_' - 's:b:/fill:_'
- 's:b:/flood:_' - 's:b:/flood:_'
- 's:b:/team:_'
- 'n:b:/bossbar:_'
# Superadmin commands - Auto-eject # Superadmin commands - Auto-eject
- 's:a:/stop:_' - 's:a:/stop:_'

View File

@ -2,7 +2,7 @@ name: TotalFreedomMod
main: me.totalfreedom.totalfreedommod.TotalFreedomMod main: me.totalfreedom.totalfreedommod.TotalFreedomMod
version: ${tfm.build.version} version: ${tfm.build.version}
description: Plugin for the Total Freedom server. description: Plugin for the Total Freedom server.
depend: [Aero, WorldEdit] depend: [Aero]
softdepend: [BukkitTelnet, Essentials, LibsDisguises] softdepend: [BukkitTelnet, Essentials, LibsDisguises]
authors: [Madgeek1450, Prozza] authors: [Madgeek1450, Prozza]