mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2024-11-04 15:26:05 +00:00
this is what happens when you force push
This commit is contained in:
parent
db42985743
commit
233632eaf1
4
pom.xml
4
pom.xml
@ -5,12 +5,12 @@
|
|||||||
|
|
||||||
<groupId>me.totalfreedom</groupId>
|
<groupId>me.totalfreedom</groupId>
|
||||||
<artifactId>totalfreedom</artifactId>
|
<artifactId>totalfreedom</artifactId>
|
||||||
<version>5.3</version>
|
<version>5.4</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<tfm.build.codename>Smartn't</tfm.build.codename>
|
<tfm.build.codename>lttstore.com</tfm.build.codename>
|
||||||
<jar.finalName>${project.name}</jar.finalName>
|
<jar.finalName>${project.name}</jar.finalName>
|
||||||
<timestamp>${maven.build.timestamp}</timestamp>
|
<timestamp>${maven.build.timestamp}</timestamp>
|
||||||
<maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format>
|
<maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format>
|
||||||
|
@ -127,10 +127,7 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
|
|||||||
public MasterBuilderWorldRestrictions mbwr;
|
public MasterBuilderWorldRestrictions mbwr;
|
||||||
public SignBlocker snp;
|
public SignBlocker snp;
|
||||||
public PlayerVerification pv;
|
public PlayerVerification pv;
|
||||||
<<<<<<< HEAD
|
|
||||||
//public HubWorldRestrictions hwr;
|
//public HubWorldRestrictions hwr;
|
||||||
=======
|
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
//
|
//
|
||||||
// Bridges
|
// Bridges
|
||||||
public ServiceManager<TotalFreedomMod> bridges;
|
public ServiceManager<TotalFreedomMod> bridges;
|
||||||
@ -205,11 +202,7 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
|
|||||||
as = services.registerService(AntiSpam.class);
|
as = services.registerService(AntiSpam.class);
|
||||||
mbl = services.registerService(MasterBuilderList.class);
|
mbl = services.registerService(MasterBuilderList.class);
|
||||||
mbwr = services.registerService(MasterBuilderWorldRestrictions.class);
|
mbwr = services.registerService(MasterBuilderWorldRestrictions.class);
|
||||||
<<<<<<< HEAD
|
|
||||||
//hwr = services.registerService(HubWorldRestrictions.class);
|
//hwr = services.registerService(HubWorldRestrictions.class);
|
||||||
=======
|
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
|
|
||||||
pl = services.registerService(PlayerList.class);
|
pl = services.registerService(PlayerList.class);
|
||||||
sh = services.registerService(Shop.class);
|
sh = services.registerService(Shop.class);
|
||||||
an = services.registerService(Announcer.class);
|
an = services.registerService(Announcer.class);
|
||||||
|
@ -24,11 +24,8 @@ public enum ConfigEntry
|
|||||||
ALLOW_UNSAFE_ENCHANTMENTS(Boolean.class, "allow.unsafe_enchantments"),
|
ALLOW_UNSAFE_ENCHANTMENTS(Boolean.class, "allow.unsafe_enchantments"),
|
||||||
ALLOW_BELLS(Boolean.class, "allow.bells"),
|
ALLOW_BELLS(Boolean.class, "allow.bells"),
|
||||||
ALLOW_ARMOR_STANDS(Boolean.class, "allow.armorstands"),
|
ALLOW_ARMOR_STANDS(Boolean.class, "allow.armorstands"),
|
||||||
<<<<<<< HEAD
|
|
||||||
ALLOW_MINECARTS (Boolean.class, "allow.minecarts"),
|
ALLOW_MINECARTS (Boolean.class, "allow.minecarts"),
|
||||||
=======
|
|
||||||
ALLOW_CLEAR_ON_JOIN(Boolean.class, "allow.clearonjoin"),
|
ALLOW_CLEAR_ON_JOIN(Boolean.class, "allow.clearonjoin"),
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
//
|
//
|
||||||
BLOCKED_CHATCODES(String.class, "blocked_chatcodes"),
|
BLOCKED_CHATCODES(String.class, "blocked_chatcodes"),
|
||||||
//
|
//
|
||||||
@ -63,16 +60,12 @@ public enum ConfigEntry
|
|||||||
DISCORD_SUPER_ROLE_ID(String.class, "discord.super_role_id"),
|
DISCORD_SUPER_ROLE_ID(String.class, "discord.super_role_id"),
|
||||||
DISCORD_TELNET_ROLE_ID(String.class, "discord.telnet_role_id"),
|
DISCORD_TELNET_ROLE_ID(String.class, "discord.telnet_role_id"),
|
||||||
DISCORD_SENIOR_ROLE_ID(String.class, "discord.senior_role_id"),
|
DISCORD_SENIOR_ROLE_ID(String.class, "discord.senior_role_id"),
|
||||||
<<<<<<< HEAD
|
|
||||||
DISCORD_DEVELOPER_ROLE_ID(String.class, "discord.developer_role_id"),
|
DISCORD_DEVELOPER_ROLE_ID(String.class, "discord.developer_role_id"),
|
||||||
DISCORD_EXECUTIVE_ROLE_ID(String.class, "discord.executive_role_id"),
|
DISCORD_EXECUTIVE_ROLE_ID(String.class, "discord.executive_role_id"),
|
||||||
DISCORD_SERVER_OWNER_ROLE_ID(String.class, "discord.server_owner_role_id"),
|
DISCORD_SERVER_OWNER_ROLE_ID(String.class, "discord.server_owner_role_id"),
|
||||||
|
|
||||||
=======
|
|
||||||
//
|
//
|
||||||
SHOP_ENABLED(Boolean.class, "shop.enabled"),
|
SHOP_ENABLED(Boolean.class, "shop.enabled"),
|
||||||
SHOP_PREFIX(String.class, "shop.prefix"),
|
SHOP_PREFIX(String.class, "shop.prefix"),
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
//
|
//
|
||||||
ADMINLIST_CLEAN_THESHOLD_HOURS(Integer.class, "adminlist.clean_threshold_hours"),
|
ADMINLIST_CLEAN_THESHOLD_HOURS(Integer.class, "adminlist.clean_threshold_hours"),
|
||||||
ADMINLIST_CONSOLE_IS_SENIOR(Boolean.class, "adminlist.console_is_senior"),
|
ADMINLIST_CONSOLE_IS_SENIOR(Boolean.class, "adminlist.console_is_senior"),
|
||||||
|
@ -141,14 +141,11 @@ public class ItemFun extends FreedomService
|
|||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
/*if (player.getWorld().equals(plugin.wm.hubworld.getWorld()) && plugin.hwr.doRestrict(player))
|
/*if (player.getWorld().equals(plugin.wm.hubworld.getWorld()) && plugin.hwr.doRestrict(player))
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}*/
|
}*/
|
||||||
=======
|
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
|
|
||||||
Location location = player.getLocation().clone();
|
Location location = player.getLocation().clone();
|
||||||
|
|
||||||
|
@ -23,10 +23,7 @@ public class WorldManager extends FreedomService
|
|||||||
public Flatlands flatlands;
|
public Flatlands flatlands;
|
||||||
public AdminWorld adminworld;
|
public AdminWorld adminworld;
|
||||||
public MasterBuilderWorld masterBuilderWorld;
|
public MasterBuilderWorld masterBuilderWorld;
|
||||||
<<<<<<< HEAD
|
|
||||||
//public HubWorld hubworld;
|
//public HubWorld hubworld;
|
||||||
=======
|
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
|
|
||||||
public WorldManager(TotalFreedomMod plugin)
|
public WorldManager(TotalFreedomMod plugin)
|
||||||
{
|
{
|
||||||
@ -35,10 +32,7 @@ public class WorldManager extends FreedomService
|
|||||||
this.flatlands = new Flatlands();
|
this.flatlands = new Flatlands();
|
||||||
this.adminworld = new AdminWorld();
|
this.adminworld = new AdminWorld();
|
||||||
this.masterBuilderWorld = new MasterBuilderWorld();
|
this.masterBuilderWorld = new MasterBuilderWorld();
|
||||||
<<<<<<< HEAD
|
|
||||||
//this.hubworld = new HubWorld();
|
//this.hubworld = new HubWorld();
|
||||||
=======
|
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -47,11 +41,7 @@ public class WorldManager extends FreedomService
|
|||||||
flatlands.getWorld();
|
flatlands.getWorld();
|
||||||
adminworld.getWorld();
|
adminworld.getWorld();
|
||||||
masterBuilderWorld.getWorld();
|
masterBuilderWorld.getWorld();
|
||||||
<<<<<<< HEAD
|
|
||||||
//hubworld.getWorld();
|
//hubworld.getWorld();
|
||||||
=======
|
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
|
|
||||||
// Disable weather
|
// Disable weather
|
||||||
if (ConfigEntry.DISABLE_WEATHER.getBoolean())
|
if (ConfigEntry.DISABLE_WEATHER.getBoolean())
|
||||||
{
|
{
|
||||||
@ -71,10 +61,7 @@ public class WorldManager extends FreedomService
|
|||||||
flatlands.getWorld().save();
|
flatlands.getWorld().save();
|
||||||
adminworld.getWorld().save();
|
adminworld.getWorld().save();
|
||||||
masterBuilderWorld.getWorld().save();
|
masterBuilderWorld.getWorld().save();
|
||||||
<<<<<<< HEAD
|
|
||||||
//hubworld.getWorld().save();
|
//hubworld.getWorld().save();
|
||||||
=======
|
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||||
@ -82,7 +69,6 @@ public class WorldManager extends FreedomService
|
|||||||
{
|
{
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
final FPlayer fPlayer = plugin.pl.getPlayer(player);
|
final FPlayer fPlayer = plugin.pl.getPlayer(player);
|
||||||
|
|
||||||
if (!plugin.al.isAdmin(player) && fPlayer.getFreezeData().isFrozen())
|
if (!plugin.al.isAdmin(player) && fPlayer.getFreezeData().isFrozen())
|
||||||
{
|
{
|
||||||
return; // Don't process adminworld validation
|
return; // Don't process adminworld validation
|
||||||
@ -125,13 +111,10 @@ public class WorldManager extends FreedomService
|
|||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
/*else if (event.getWorld().equals(hubworld.getWorld()) && hubworld.getWeatherMode() != WorldWeather.OFF)
|
/*else if (event.getWorld().equals(hubworld.getWorld()) && hubworld.getWeatherMode() != WorldWeather.OFF)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}*/
|
}*/
|
||||||
=======
|
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@ -156,13 +139,10 @@ public class WorldManager extends FreedomService
|
|||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
/*else if (event.getWorld().equals(hubworld.getWorld()) && hubworld.getWeatherMode() != WorldWeather.OFF)
|
/*else if (event.getWorld().equals(hubworld.getWorld()) && hubworld.getWeatherMode() != WorldWeather.OFF)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}*/
|
}*/
|
||||||
=======
|
|
||||||
>>>>>>> d582398f932330853b0456b684654da4c860e831
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user