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

Cleanup

Browse Source
This commit is contained in:
Steven Lawson 2012-12-10 22:05:08 -05:00
parent 972e81276d
commit d066c1b754
2 changed files with 84 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
View File

@ -102,7 +102,9 @@ public class TFM_PlayerListener implements Listener
} }
case BLAZE_ROD: case BLAZE_ROD:
{ {
if (TotalFreedomMod.allowExplosions && TFM_SuperadminList.isSeniorAdmin(player)) if (TotalFreedomMod.allowExplosions)
{
if (TFM_SuperadminList.isSeniorAdmin(player, true))
{ {
Block target_block; Block target_block;
@ -128,11 +130,14 @@ public class TFM_PlayerListener implements Listener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
}
break; break;
} }
case CARROT: case CARROT:
{ {
if (TotalFreedomMod.allowExplosions && TFM_SuperadminList.isSeniorAdmin(player)) if (TotalFreedomMod.allowExplosions)
{
if (TFM_SuperadminList.isSeniorAdmin(player, true))
{ {
Location player_location = player.getLocation().clone(); Location player_location = player.getLocation().clone();
@ -186,6 +191,7 @@ public class TFM_PlayerListener implements Listener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
}
break; break;
} }
} }
@ -291,6 +297,7 @@ public class TFM_PlayerListener implements Listener
p.setVelocity(new Vector(0, playerdata.orbitStrength(), 0)); p.setVelocity(new Vector(0, playerdata.orbitStrength(), 0));
} }
} }
if (TotalFreedomMod.landminesEnabled && TotalFreedomMod.allowExplosions) if (TotalFreedomMod.landminesEnabled && TotalFreedomMod.allowExplosions)
{ {
Iterator<TFM_LandmineData> landmines = TFM_LandmineData.landmines.iterator(); Iterator<TFM_LandmineData> landmines = TFM_LandmineData.landmines.iterator();

13
src/me/StevenLawson/TotalFreedomMod/TFM_SuperadminList.java
View File

@ -202,6 +202,19 @@ public class TFM_SuperadminList
public static boolean isSeniorAdmin(CommandSender user) public static boolean isSeniorAdmin(CommandSender user)
{ {
return isSeniorAdmin(user, false);
}
public static boolean isSeniorAdmin(CommandSender user, boolean verify_is_superadmin)
{
if (verify_is_superadmin)
{
if (!isUserSuperadmin(user))
{
return false;
}
}
String user_name = user.getName().toLowerCase(); String user_name = user.getName().toLowerCase();
if (!(user instanceof Player)) if (!(user instanceof Player))