Blocked TNT Minecarts from being placed

Changed madgeek1540 to madgeek1450

CONTRIBUTING.md

@@ -0,0 +1,65 @@
+# How to contribute
+
+TotalFreedomMod aims to be a fully functional all-op server mod which works in
+a large range of configurations. In order to be as flexible as possible on the
+server-end, we encourage contributing to TotalFreedomMod by making 'pull-requests'
+to this repository.
+
+## Getting Started
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* If the issue is a bug, submit a ticket for it, assuming one does not already exist.
+  * Clearly describe the issue including steps to reproduce it.
+  * Make sure you fill in the earliest version that you know has the issue.
+* Fork the repository on GitHub
+
+## Making Changes
+
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * Only target release branches if you are certain your addition must be on that
+    branch.
+  * To quickly create a topic branch based on master; `git checkout -b contribution`
+    Please avoid working directly on the `master` branch.
+* Make changes and commit where necessary.
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are in line with those which are already made.
+* Make sure your changes build (*and work!*).
+
+## Tips on getting your pull request accepted
+* Make sure your changes work and compile without difficulty.
+* Make sure your change adds something useful, do not add commands to micromanage
+  the server. (ie: Shorthands for a collection of commands)
+* Features must be in line the general idea of "Total Freedom".
+* Changes must be directed towards the main "TotalFreedom" server. Adding names such
+  as the name of your own TotalFreedom-like server will get your pull request denied.
+* Do not add yourself to the developer list.
+* Ensure that you use the correct whitespace-style. That is: 4 spaces as indentation.
+* Please make sure your changes are written such as other features would be. Eg: commands
+  have their own class and extend TFM_Command.
+* Make sure your code is written in the [Allman style](http://en.wikipedia.org/wiki/Indent_style#Allman_style).
+* Do not increment the version number.
+* If you want to add multiple changes, please make one pull request per change. This
+  way, it's easier to accept your changes faster and won't block the other changes if there
+  is an issue with a specific line of code.
+* Please make sure there are no bugs in your code.
+* Please avoid having to add files in the main namespace where possible.
+* Make sure all changes work before you commit these, this avoids having multiple
+  unnecessary commits.
+* Please refrain from using an excessive amount of commits. As few as possible is generally the best.
+* Please do not spread your addition over several pull-requests.
+
+## Submitting Changes
+
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request to this repository.
+  * Explain in detail what each one of your commits changes and point out any big changes.
+* Wait as a developer evaluates your changes.
+
+# Additional Resources
+
+* [TotalFreedom information](http://totalfreedom.me)
+* [TotalFreedom forums](http://totalfreedom.boards.net)
+* [Bug tracker](https://github.com/TotalFreedom/TotalFreedomMod/issues)
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

LICENCE.md

@@ -0,0 +1,16 @@
+# Legal
+
+TotalFreedomMod by Madgeek1450 and DarthSalamon is an effort to create an opensource plugin to effectively run a "Total Freedom" like all-Op server. It consists of over 85 custom coded commands and a large variety of distinguishable features not included in any other plugin. The plugin has since its beginning grown immensely. Together with the main server "TotalFreedom" (http://totalfreedom.me) TotalFreedomMod has a long-standing reputation of effectiveness whilst maintaining a clear feel of openness towards the administrators and the players themselves.
+
+## License
+
+TotalFreedomMod sourcecode is freely available under the GNU GPLv3 License with a few restrictions in place. The license is available here: http://www.gnu.org/licenses/gpl.txt
+
+The few restrictions are in place to make sure that credit is given to the original authors who remain the maintainers of the plugin and it's sourcecode.
+
+These are the restrictions under which the sourcecode is licensed:
+  * A un-edited copy of this license must always be included with this sourcecode.
+  * TotalFreedomMod sourcecode and its derrivations are freely distributable between anyone who choses to download it.
+  * You may not remove the keywords "Madgeek1450", "StevenLawson", "DarthSalamon" and "jeromsar" from any part of the sourcecode.
+  * However, compiled binaries (*.jar's) are not to be distributed. If you wish to obtain a copy of TotalFreedomMod you must compile the original sourcecode or it's derivations yourself using an IDE like netbeans. Official superadmins and above of the TotalFreedom (totalfreedom.me) server  may obtain a compiled libary with the same limitations as described in this document.
+  * Any conditions on this license may be waived by any of the official developers.

appinfo.properties

@@ -1,5 +1,5 @@
-#Fri, 17 May 2013 22:55:47 +0200
+#Sun, 23 Jun 2013 15:16:34 +0200
 
-program.VERSION=2.17
+program.VERSION=2.19
-program.BUILDNUM=210
+program.BUILDNUM=221
-program.BUILDDATE=05/17/2013 10\:55 PM
+program.BUILDDATE=06/23/2013 03\:16 PM

buildnumber.properties

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri May 17 22:55:47 CEST 2013
+#Sun Jun 23 15:16:34 CEST 2013
-build.number=211
+build.number=222

src/config.yml

@@ -1,4 +1,4 @@
-# TotalFreedomMod v2.17 Configuration
+# TotalFreedomMod v2.19 Configuration
 # by Madgeek1450 and DarthSalamon
 
 # Block placement prevention:
@@ -8,6 +8,7 @@ allow_lava_damage: false
 allow_lava_place: false
 allow_water_place: false
 allow_fluid_spread: false
+allow_tnt_minecarts: false
 
 # Explosion management:
 allow_explosions: false

src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java

@@ -1,6 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.GameMode;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -29,8 +31,29 @@ public class Command_creative extends TFM_Command
         }
         else
         {
-            if (senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender))
+            if (args[0].equalsIgnoreCase("-a"))
             {
+               if (!TFM_SuperadminList.isUserSuperadmin(sender))
+               {
+                   sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
+                   return true;
+               }
+
+                for (Player player : server.getOnlinePlayers())
+                {
+                    player.setGameMode(GameMode.CREATIVE);
+                }
+
+                TFM_Util.adminAction(sender.getName(), "Changing everyone's gamemode to creative", false);
+                return true;
+            }
+
+            if (!(senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender)))
+            {
+                playerMsg("Only superadmins can change other user's gamemode.");
+                return true;
+            }
+
             try
             {
                 p = getPlayer(args[0]);
@@ -40,12 +63,7 @@ public class Command_creative extends TFM_Command
                 sender.sendMessage(ex.getMessage());
                 return true;
             }
-            }
+            
-            else
-            {
-                playerMsg("Only superadmins can change other user's gamemode.");
-                return true;
-            }
         }
 
         playerMsg("Setting " + p.getName() + " to game mode 'Creative'.");

src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java

@@ -43,7 +43,7 @@ public class Command_gtfo extends TFM_Command
         
         //rollback
         
-        server.dispatchCommand(sender, "rollback " + p.getName() + " all");
+        server.dispatchCommand(sender, "rollback " + p.getName());
         
 
         // deop

src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java

@@ -72,7 +72,7 @@ public class Command_list extends TFM_Command
                     prefix = (ChatColor.GOLD + "[SA]");
                 }
 
-                if (p.getName().equalsIgnoreCase("madgeek1450") || p.getName().equalsIgnoreCase("darthsalamon"))
+                if (TFM_Util.DEVELOPERS.contains(p.getName()))
                 {
                     prefix = (ChatColor.DARK_PURPLE + "[Dev]");
                 }

src/me/StevenLawson/TotalFreedomMod/Commands/Command_purgeall.java

@@ -17,7 +17,7 @@ public class Command_purgeall extends TFM_Command
         server.dispatchCommand(sender, "mute purge");
         server.dispatchCommand(sender, "fr purge");
         server.dispatchCommand(sender, "mp");
-        server.dispatchCommand(sender, "blockcmd");
+        server.dispatchCommand(sender, "blockcmd purge");
         server.dispatchCommand(sender, "halt purge");
         
         //If I'm missing any, lemme know. Or just add it yourself.

src/me/StevenLawson/TotalFreedomMod/Commands/Command_rollback.java

@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
 
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = true)
-@CommandParameters(description = "Issues a rollback on a player", usage = "/<command> <[partialname] | purge [partialname] | purgeall>")
+@CommandParameters(description = "Issues a rollback on a player", usage = "/<command> <[partialname] | purge [partialname] | purgeall>", aliases = "rb")
 public class Command_rollback extends TFM_Command {
 
     @Override

src/me/StevenLawson/TotalFreedomMod/Commands/Command_stop.java

@@ -17,7 +17,7 @@ public class Command_stop extends TFM_Command
 
         for (Player p : server.getOnlinePlayers())
         {
-            p.kickPlayer("Server is going offline, come back in a few minutes.");
+            p.kickPlayer("Server is going offline, come back in about 20 seconds.");
         }
 
         server.shutdown();

src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java

@@ -1,6 +1,9 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import me.StevenLawson.TotalFreedomMod.TFM_Util;
+import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.command.Command;
@@ -8,7 +11,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Quickly change your own gamemode to survival, or define someone's username to change theirs.", usage = "/<command> [partialname]")
+@CommandParameters(description = "Quickly change your own gamemode to survival, or define someone's username to change theirs.", usage = "/<command> <[partialname] | -a>")
 public class Command_survival extends TFM_Command
 {
     @Override
@@ -24,12 +27,30 @@ public class Command_survival extends TFM_Command
         }
 
         Player p;
+        
         if (args.length == 0)
         {
             p = sender_p;
         }
         else
         {
+            if (args[0].equalsIgnoreCase("-a"))
+            {
+               if (!TFM_SuperadminList.isUserSuperadmin(sender) || senderIsConsole)
+               {
+                   sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS);
+                   return true;
+               }
+
+                for (Player player : server.getOnlinePlayers())
+                {
+                    player.setGameMode(GameMode.SURVIVAL);
+                }
+
+                TFM_Util.adminAction(sender.getName(), "Changing everyone's gamemode to survival", false);
+                return true;
+            }
+
             if (senderIsConsole || TFM_SuperadminList.isUserSuperadmin(sender))
             {
                 try

src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java

@@ -18,6 +18,21 @@ public class Command_wildcard extends TFM_Command
             playerMsg("What the hell are you trying to do, you stupid idiot...", ChatColor.RED);
             return true;
         }
+        if (args[0].equals("gtfo"))
+        {
+            playerMsg("Nice try", ChatColor.RED);
+            return true;
+        }
+        if (args[0].equals("doom"))
+        {
+            playerMsg("Look, we all hate people, but this is not the way to deal with it, doom is evil enough!", ChatColor.RED);
+            return true;
+        }
+        if (args[0].equals("saconfig"))
+        {
+            playerMsg("WOA, WTF are you trying to do???", ChatColor.RED);
+            return true;
+        }
 
         String base_command = StringUtils.join(args, " ");
 

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java

@@ -11,7 +11,6 @@ import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java

@@ -36,7 +36,7 @@ public class TFM_EntityListener implements Listener
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityCombust(EntityCombustEvent event)
     {
-        if (!TotalFreedomMod.allowFireSpread)
+        if (!TotalFreedomMod.allowExplosions)
         {
             event.setCancelled(true);
         }

src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java

@@ -44,22 +44,36 @@ public class TFM_PlayerListener implements Listener
                 switch (event.getMaterial())
                 {
                     case WATER_BUCKET:
+                    {
+                        if (!TotalFreedomMod.allowWaterPlace)
                         {
                             player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
                             player.sendMessage(ChatColor.GRAY + "Water buckets are currently disabled.");
                             event.setCancelled(true);
                             return;
                         }
+                    }
                     case LAVA_BUCKET:
+                    {
+                        if (!TotalFreedomMod.allowLavaPlace)
                         {
                             player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
                             player.sendMessage(ChatColor.GRAY + "Lava buckets are currently disabled.");
                             event.setCancelled(true);
+                            return;
                         }
-                    case POTION:
+                    }
+                    case EXPLOSIVE_MINECART:
                     {
+                        if (!TotalFreedomMod.allowTntMinecarts)
+                        {
+                            player.getInventory().clear(player.getInventory().getHeldItemSlot());
+                            player.sendMessage(ChatColor.GRAY + "TNT minecarts are currently disabled.");
+                            event.setCancelled(true);
                         }
                     }
+                
+                }
                 break;
             }
             case LEFT_CLICK_AIR:
@@ -98,7 +112,6 @@ public class TFM_PlayerListener implements Listener
                             }
 
                             event.setCancelled(true);
-                            return;
                         }
                         break;
                     }
@@ -489,6 +502,20 @@ public class TFM_PlayerListener implements Listener
                 block_command = true;
             }
         }
+        else if (Pattern.compile("^/nuke").matcher(command).find())
+        {
+            if (!TFM_SuperadminList.isUserSuperadmin(p))
+            {
+                block_command = true;
+            }
+        }
+        else if (Pattern.compile("^/rl").matcher(command).find())
+        {
+            if (!TFM_SuperadminList.isUserSuperadmin(p))
+            {
+                block_command = true;
+            }
+        }
         else if (Pattern.compile("^/save-").matcher(command).find())
         {
             if (!TFM_SuperadminList.isUserSuperadmin(p))
@@ -496,6 +523,13 @@ public class TFM_PlayerListener implements Listener
                 block_command = true;
             }
         }
+        else if (Pattern.compile("^/clearhistory").matcher(command).find())
+        {
+            if (!TFM_SuperadminList.isUserSuperadmin(p))
+            {
+                block_command = true;
+            }
+        }
 
         if (block_command)
         {

src/me/StevenLawson/TotalFreedomMod/TFM_RollbackManager.java

@@ -22,7 +22,7 @@ public class TFM_RollbackManager
         {
             e = new ArrayList<TFM_RollbackEntry>();
         }
-        e.add(new TFM_RollbackEntry(block));
+        e.add(0, new TFM_RollbackEntry(block));
         entries.put(player.getName(), e);
     }
 
@@ -37,7 +37,7 @@ public class TFM_RollbackManager
         {
             e = new ArrayList<TFM_RollbackEntry>();
         }
-        e.add(entry);
+        e.add(0, entry);
         entries.put(player.getName(), e);
     }
 

src/me/StevenLawson/TotalFreedomMod/TFM_Util.java

@@ -27,6 +27,7 @@ public class TFM_Util
     private static final Map<String, Integer> eject_tracker = new HashMap<String, Integer>();
     public static final Map<String, EntityType> mobtypes = new HashMap<String, EntityType>();
     public static final List<String> STOP_COMMANDS = Arrays.asList("stop", "off", "end", "halt", "die");
+    public static final List<String> DEVELOPERS = Arrays.asList("Madgeek1450", "DarthSalamon", "AcidicCyanide", "wild1145", "HeXeRei452", "disaster839");
 
     static
     {
@@ -979,7 +980,9 @@ public class TFM_Util
         String prefix;
         if (senderIsConsole) {
            prefix = ChatColor.BLUE + "(Console)";
-        } else {
+        }
+        else
+        {
             if (TFM_SuperadminList.isSeniorAdmin(sender))
             {
                 prefix = ChatColor.LIGHT_PURPLE + "(SrA)";
@@ -987,8 +990,7 @@ public class TFM_Util
             {
                 prefix = ChatColor.GOLD + "(SA)";
             }
-            if (sender.getName().equalsIgnoreCase("Madgeek1450")
+            if (DEVELOPERS.contains(sender.getName()))
-                    || sender.getName().equalsIgnoreCase("DarthSalamon"))
             {
                 prefix = ChatColor.DARK_PURPLE + "(Dev)";
             }

src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java

@@ -201,6 +201,8 @@ public class TotalFreedomMod extends JavaPlugin
     public static boolean allowLavaPlace = false;
     public static boolean allowWaterPlace = false;
     public static Boolean allowExplosions = false;
+    public static boolean allowFliudSpread = false;
+    public static boolean allowTntMinecarts = false;
     public static double explosiveRadius = 4.0D;
     public static boolean autoEntityWipe = true;
     public static boolean nukeMonitor = true;
@@ -222,7 +224,6 @@ public class TotalFreedomMod extends JavaPlugin
     public static boolean tossmobEnabled = false;
     public static boolean generateFlatlands = true;
     public static String flatlandsGenerationParams = "16,stone,32,dirt,1,grass";
-    public static boolean allowFliudSpread = false;
     public static boolean adminOnlyMode = false;
     public static boolean protectedAreasEnabled = true;
     public static boolean autoProtectSpawnpoints = true;
@@ -245,6 +246,7 @@ public class TotalFreedomMod extends JavaPlugin
             allowLavaPlace = config.getBoolean("allow_lava_place", allowLavaPlace);
             allowWaterPlace = config.getBoolean("allow_water_place", allowWaterPlace);
             allowExplosions = config.getBoolean("allow_explosions", allowExplosions);
+            allowTntMinecarts = config.getBoolean("allow_tnt_minecarts", allowTntMinecarts);
             explosiveRadius = config.getDouble("explosiveRadius", explosiveRadius);
             autoEntityWipe = config.getBoolean("auto_wipe", autoEntityWipe);
             nukeMonitor = config.getBoolean("nuke_monitor", nukeMonitor);

src/permban.yml

@@ -7,3 +7,4 @@ badplayer1:
   - 321.321.321.321
 badplayer2:
   - 111.111.111.111
+badplayer3: []

src/plugin.yml

@@ -1,6 +1,6 @@
 name: TotalFreedomMod
 main: me.StevenLawson.TotalFreedomMod.TotalFreedomMod
-version: 2.17
+version: 2.19
 description: Plugin for the Total Freedom server.
 authors: [StevenLawson / Madgeek1450, JeromSar / DarthSalamon]
 

src/superadmin.yml

@@ -15,7 +15,7 @@ superadmins:
     - 127.0.0.1
     - 8.8.8.8
     last_login: Sun, 11 Nov 2012 01:09:14 -0500
-    custom_login_message: the &5Chief-Developer&b and &6Master-ass-kicker&b.
+    custom_login_message: the &4Co-Founder&b and &6Master-ass-kicker&b.
     is_senior_admin: true
     console_aliases:
     - madgeek