AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-11 13:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

this is what happens when you force push

Browse Source
This commit is contained in:
Robinson Gallego
2019-11-03 17:40:58 -05:00
parent db42985743
commit 233632eaf1
5 changed files with 2 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java
View File

@ -23,10 +23,7 @@ public class WorldManager extends FreedomService
public Flatlands flatlands;
public AdminWorld adminworld;
public MasterBuilderWorld masterBuilderWorld;
<<<<<<< HEAD
//public HubWorld hubworld;
=======
>>>>>>> d582398f932330853b0456b684654da4c860e831
public WorldManager(TotalFreedomMod plugin)
{
@ -35,10 +32,7 @@ public class WorldManager extends FreedomService
this.flatlands = new Flatlands();
this.adminworld = new AdminWorld();
this.masterBuilderWorld = new MasterBuilderWorld();
<<<<<<< HEAD
//this.hubworld = new HubWorld();
=======
>>>>>>> d582398f932330853b0456b684654da4c860e831
}
@Override
@ -47,11 +41,7 @@ public class WorldManager extends FreedomService
flatlands.getWorld();
adminworld.getWorld();
masterBuilderWorld.getWorld();
<<<<<<< HEAD
//hubworld.getWorld();
=======
>>>>>>> d582398f932330853b0456b684654da4c860e831
// Disable weather
if (ConfigEntry.DISABLE_WEATHER.getBoolean())
{
@ -71,10 +61,7 @@ public class WorldManager extends FreedomService
flatlands.getWorld().save();
adminworld.getWorld().save();
masterBuilderWorld.getWorld().save();
<<<<<<< HEAD
//hubworld.getWorld().save();
=======
>>>>>>> d582398f932330853b0456b684654da4c860e831
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@ -82,7 +69,6 @@ public class WorldManager extends FreedomService
{
final Player player = event.getPlayer();
final FPlayer fPlayer = plugin.pl.getPlayer(player);
if (!plugin.al.isAdmin(player) && fPlayer.getFreezeData().isFrozen())
{
return; // Don't process adminworld validation
@ -125,13 +111,10 @@ public class WorldManager extends FreedomService
{
return;
}
<<<<<<< HEAD
/*else if (event.getWorld().equals(hubworld.getWorld()) && hubworld.getWeatherMode() != WorldWeather.OFF)
{
return;
}*/
=======
>>>>>>> d582398f932330853b0456b684654da4c860e831
}
catch (Exception ex)
{
@ -156,13 +139,10 @@ public class WorldManager extends FreedomService
{
return;
}
<<<<<<< HEAD
/*else if (event.getWorld().equals(hubworld.getWorld()) && hubworld.getWeatherMode() != WorldWeather.OFF)
{
return;
}*/
=======
>>>>>>> d582398f932330853b0456b684654da4c860e831
}
catch (Exception ex)
{