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

Revert "Merge branch 'development' of https://github.com/TFPatches/TotalFreedomMod into development"

Browse Source 
This reverts commit 4407e9e6ec, reversing
changes made to e4c9ea656e.
This commit is contained in:
Telesphoreo
2020-08-15 17:41:23 -05:00
parent 4407e9e6ec
commit da80f1b69e
186 changed files with 1828 additions and 1275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/me/totalfreedom/totalfreedommod/world/StaffWorld.java → src/main/java/me/totalfreedom/totalfreedommod/world/AdminWorld.java
View File

@ -15,7 +15,7 @@ import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerMoveEvent;
public final class StaffWorld extends CustomWorld
public final class AdminWorld extends CustomWorld
{
private static final long CACHE_CLEAR_FREQUENCY = 30L * 1000L; //30 seconds, milliseconds
@ -27,9 +27,9 @@ public final class StaffWorld extends CustomWorld
private WorldWeather weather = WorldWeather.OFF;
private WorldTime time = WorldTime.INHERIT;
public StaffWorld()
public AdminWorld()
{
super("staffworld");
super("adminworld");
}
@Override
@ -59,7 +59,7 @@ public final class StaffWorld extends CustomWorld
org.bukkit.material.Sign signData = (org.bukkit.material.Sign)welcomeSign.getData();
signData.setFacingDirection(BlockFace.NORTH);
welcomeSign.setLine(0, ChatColor.GREEN + "StaffWorld");
welcomeSign.setLine(0, ChatColor.GREEN + "AdminWorld");
welcomeSign.setLine(1, ChatColor.DARK_GRAY + "---");
welcomeSign.setLine(2, ChatColor.YELLOW + "Spawn Point");
welcomeSign.setLine(3, ChatColor.DARK_GRAY + "---");
@ -94,7 +94,7 @@ public final class StaffWorld extends CustomWorld
if (lastTP == null || lastTP + TP_COOLDOWN_TIME <= currentTimeMillis)
{
teleportCooldown.put(player, currentTimeMillis);
FLog.info(player.getName() + " attempted to access the StaffWorld.");
FLog.info(player.getName() + " attempted to access the AdminWorld.");
event.setTo(Bukkit.getWorlds().get(0).getSpawnLocation());
}
return false;

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

@ -17,14 +17,14 @@ public class WorldManager extends FreedomService
{
public Flatlands flatlands;
public StaffWorld staffworld;
public AdminWorld adminworld;
public MasterBuilderWorld masterBuilderWorld;
public HubWorld hubworld;
public WorldManager()
{
this.flatlands = new Flatlands();
this.staffworld = new StaffWorld();
this.adminworld = new AdminWorld();
this.masterBuilderWorld = new MasterBuilderWorld();
this.hubworld = new HubWorld();
}
@ -33,7 +33,7 @@ public class WorldManager extends FreedomService
public void onStart()
{
flatlands.getWorld();
staffworld.getWorld();
adminworld.getWorld();
masterBuilderWorld.getWorld();
hubworld.getWorld();
@ -54,7 +54,7 @@ public class WorldManager extends FreedomService
public void onStop()
{
flatlands.getWorld().save();
staffworld.getWorld().save();
adminworld.getWorld().save();
masterBuilderWorld.getWorld().save();
hubworld.getWorld().save();
}
@ -64,7 +64,7 @@ public class WorldManager extends FreedomService
{
try
{
if (event.getWorld().equals(staffworld.getWorld()) && staffworld.getWeatherMode() != WorldWeather.OFF)
if (event.getWorld().equals(adminworld.getWorld()) && adminworld.getWeatherMode() != WorldWeather.OFF)
{
return;
}
@ -92,7 +92,7 @@ public class WorldManager extends FreedomService
{
try
{
if (event.getWorld().equals(staffworld.getWorld()) && staffworld.getWeatherMode() != WorldWeather.OFF)
if (event.getWorld().equals(adminworld.getWorld()) && adminworld.getWeatherMode() != WorldWeather.OFF)
{
return;
}

4
src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java
View File

@ -57,7 +57,7 @@ public class WorldRestrictions extends FreedomService
}
}
if (!plugin.sl.isStaff(player) && player.getWorld().equals(plugin.wm.staffworld.getWorld()))
if (!plugin.al.isAdmin(player) && player.getWorld().equals(plugin.wm.adminworld.getWorld()))
{
return true;
}
@ -133,7 +133,7 @@ public class WorldRestrictions extends FreedomService
for obtaining a list of a plugin's commands are returning null for world edit. */
String command = event.getMessage().split("\\s+")[0].substring(1, event.getMessage().split("\\s+")[0].length()).toLowerCase();
String allowed = player.getWorld().equals(plugin.wm.staffworld.getWorld()) ? "Staff" : "Master Builders";
String allowed = player.getWorld().equals(plugin.wm.adminworld.getWorld()) ? "Admins" : "Master Builders";
if (command.startsWith("/") || BLOCKED_WORLDEDIT_COMMANDS.contains(command))
{