AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-30 10:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Bleeding] Save when purging (ip)ban list. Resolves #219

Browse Source 
Small changes
This commit is contained in:
unknown 2014-06-28 00:22:55 +02:00
parent 1fb14ca1dd
commit 850fd9aa4a
5 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildnumber.properties
View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Sun Jun 22 18:05:43 CEST 2014 #Fri Jun 27 23:44:06 CEST 2014
build.number=876 build.number=881

42
src/me/StevenLawson/TotalFreedomMod/Bridge/TFM_WorldEditBridge.java
View File

@ -130,26 +130,32 @@ public class TFM_WorldEditBridge
try try
{ {
final LocalSession session = getPlayerSession(player); final LocalSession session = getPlayerSession(player);
if (session != null)
if (session == null)
{ {
final World selectionWorld = session.getSelectionWorld(); return;
final Region selection = session.getSelection(selectionWorld);
if (TFM_ProtectedArea.isInProtectedArea(
getBukkitVector(selection.getMinimumPoint()),
getBukkitVector(selection.getMaximumPoint()),
selectionWorld.getName()))
{
new BukkitRunnable()
{
@Override
public void run()
{
player.sendMessage(ChatColor.RED + "The region that you selected contained a protected area. Selection cleared.");
session.getRegionSelector(selectionWorld).clear();
}
}.runTaskLater(TotalFreedomMod.plugin, 1L);
}
} }
final World selectionWorld = session.getSelectionWorld();
final Region selection = session.getSelection(selectionWorld);
if (TFM_ProtectedArea.isInProtectedArea(
getBukkitVector(selection.getMinimumPoint()),
getBukkitVector(selection.getMaximumPoint()),
selectionWorld.getName()))
{
new BukkitRunnable()
{
@Override
public void run()
{
player.sendMessage(ChatColor.RED + "The region that you selected contained a protected area. Selection cleared.");
session.getRegionSelector(selectionWorld).clear();
}
}.runTask(TotalFreedomMod.plugin);
}
} }
catch (IncompleteRegionException ex) catch (IncompleteRegionException ex)
{ {

9
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_TelnetListener.java
View File

@ -27,19 +27,12 @@ public class TFM_TelnetListener implements Listener
if (admin == null || !admin.isTelnetAdmin()) if (admin == null || !admin.isTelnetAdmin())
{ {
event.setCancelled(true);
return; return;
} }
event.setBypassPassword(true); event.setBypassPassword(true);
event.setName(admin.getLastLoginName()); event.setName(admin.getLastLoginName());
final OfflinePlayer player = Bukkit.getOfflinePlayer(admin.getLastLoginName());
if (player == null)
{
return;
}
event.setName(player.getName());
} }
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)

8
src/me/StevenLawson/TotalFreedomMod/TFM_AdminList.java
View File

@ -246,13 +246,13 @@ public class TFM_AdminList
config.set("clean_threshold_hours", cleanThreshold); config.set("clean_threshold_hours", cleanThreshold);
Iterator<Entry<UUID, TFM_Admin>> it = adminList.entrySet().iterator(); final Iterator<Entry<UUID, TFM_Admin>> it = adminList.entrySet().iterator();
while (it.hasNext()) while (it.hasNext())
{ {
Entry<UUID, TFM_Admin> pair = it.next(); final Entry<UUID, TFM_Admin> pair = it.next();
UUID uuid = pair.getKey(); final UUID uuid = pair.getKey();
TFM_Admin superadmin = pair.getValue(); final TFM_Admin superadmin = pair.getValue();
config.set("admins." + uuid + ".last_login_name", superadmin.getLastLoginName()); config.set("admins." + uuid + ".last_login_name", superadmin.getLastLoginName());
config.set("admins." + uuid + ".is_activated", superadmin.isActivated()); config.set("admins." + uuid + ".is_activated", superadmin.isActivated());

2
src/me/StevenLawson/TotalFreedomMod/TFM_BanManager.java
View File

@ -271,11 +271,13 @@ public class TFM_BanManager
public void purgeIpBans() public void purgeIpBans()
{ {
ipBans.clear(); ipBans.clear();
save();
} }
public void purgeUuidBans() public void purgeUuidBans()
{ {
uuidBans.clear(); uuidBans.clear();
save();
} }
public static TFM_BanManager getInstance() public static TFM_BanManager getInstance()