AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2026-07-15 18:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
810 Commits 38 Branches 58 Tags
6ad1187eef6a8e58bbb15de550c3c0e319270900
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
StevenLawson 6ad1187eef Merge branch 'patch-2' 2014-08-15 16:29:53 -04:00
StevenLawson 1bf1267b49 Remove extra lines. 2014-08-15 16:29:40 -04:00
StevenLawson d2f6f7f51a Make '/tfm reload' update blocked commands. Resolves #265. 
Config must be reloaded in order to pull in any changes to blocked commands list.
 2014-08-15 16:16:45 -04:00
StevenLawson dc2c996516 Block tags containing "console", fixes #260. 2014-08-15 15:59:43 -04:00
StevenLawson f502e44764 Added /nickclean - mass remove distracting things from player nicknames. 2014-08-14 19:07:52 -04:00
StevenLawson a1c11f4e0f Using playerMsg(final String message) instead of playerMsg(final CommandSender sender, final String message) when possible. 2014-08-14 15:49:48 -04:00
StevenLawson 48fd4c590d Use TFM_Command.playerMsg instead of TFM_Util.playerMsg for commands. 2014-08-13 20:56:04 -04:00
StevenLawson 97cde0cfd4 Modified /qop and /qdeop to be a bit less spammy when multiple matches are found. 2014-08-13 20:11:12 -04:00
StevenLawson 429269d8d2 Partial fix for #267. 
Still need to implement method to kick people off telnet if they are deactivated while connected.

Also - 800th commit! Woohoo!
 2014-08-12 19:38:32 -04:00
StevenLawson 1a50c16d9a Rework tags (now they won't duplicate when Essentials changes display name). 2014-08-12 18:25:57 -04:00
StevenLawson 891d8d178f Use commons' substring function to avoid IndexOutOfBoundsExceptions. 2014-08-12 15:32:56 -04:00
StevenLawson d5d6f18fb4 Truncate string argument on calls calls to setPlayerListName. Resolves #262. 2014-08-07 20:47:15 -04:00
StevenLawson ecbd70493b Merge branch 'master' of https://github.com/TotalFreedom/TotalFreedomMod 2014-08-02 11:14:55 -04:00
StevenLawson 4988140268 Fixed mixed string concatenation / String.format usage. 
Doesn't make much sense to use string concatenation and a String.format to generate the same output. I believe this method is much more readable.
 2014-08-02 11:14:37 -04:00
StevenLawson 3d6be1cd51 Significantly speed up player list loading. 2014-07-29 22:38:08 -04:00
StevenLawson 01edfed307 Tweak /whohas. Note the change from bitwise & to logical && resolving possible bug. 2014-07-26 11:48:17 -04:00
StevenLawson 5e4d1d0d6d Limit duration and amplifier for /potion command. Resolves #243 2014-07-26 11:47:23 -04:00
StevenLawson 86f61f1487 Restructure gadmin. Resolves #245 2014-07-25 23:11:44 -04:00
StevenLawson 461cfa7bdc Switched from Essentials' StringUtil to Apache Commons StringUtils. 2014-07-20 17:40:06 -04:00
StevenLawson 75b296496e Removed DisguiseCraft support. 2014-07-20 17:25:45 -04:00
StevenLawson 183277db21 Clean up sources of compile warnings. 
Move anything that causes deprecation warnings into TFM_DepreciationAggregator if no alternative implementation possible.
 2014-07-19 21:02:00 -04:00
StevenLawson 2b597867f0 Eliminate usage of deprecated org.bukkit.Server.matchPlayer 
Suppress unchecked cast warnings in Module_players.
 2014-07-19 17:39:42 -04:00
StevenLawson 7f7312c0a2 Fix landmine. 2014-07-19 17:34:12 -04:00
StevenLawson 73214165a5 Fix glitch in clownfish smacker. 2014-07-19 15:29:07 -04:00
StevenLawson 54be4f7e88 Added clownfish smacker. 2014-07-19 14:59:02 -04:00
StevenLawson 3ccab5f534 Fixed exploit that allows command blocker to be bypassed. 2014-07-17 17:28:32 -04:00
StevenLawson f635af5f95 Fix error when using /ops purge. 2014-07-16 20:41:14 -04:00
StevenLawson cc3a183cac Fixed toggle message for /toggle fluidspread. 2014-07-13 22:43:27 -04:00
StevenLawson 173b686658 Add HTTPD Module_logs, resolves #238 2014-07-13 18:04:08 -04:00
Steven Lawson d05f8b7169 Merge pull request #140 from Wilee999/patch-5 
Changed to raw logger output on join/quit messages.
 2014-02-19 14:33:50 -05:00
Steven Lawson 0d32ca5451 Merge pull request #132 from Wilee999/pull3 
Fix command error in /wildcard.
 2014-01-31 11:06:47 -08:00
StevenLawson 1a5f854552 Implemented Essentials-based AFK Auto-Kick w/ server load based trigger threshold. 2013-10-08 14:41:05 -04:00
StevenLawson 13eeccbc40 Add handling for isTelnetAdmin to SA list saving. 2013-09-27 11:15:15 -04:00
StevenLawson 2b611a2bee Add "is_telnet_admin:" entries to sample superadmin.yml 2013-09-27 11:06:52 -04:00
StevenLawson ed0aef033c Clean up TFM_CustomListener. 2013-09-27 11:04:46 -04:00
StevenLawson 2d655e4009 Added "isTelnetAdmin" to SA list. 2013-09-27 11:01:30 -04:00
StevenLawson 81995f38a1 Add handler for me.StevenLawson.BukkitTelnet.TelnetPreLoginEvent 2013-09-27 10:26:59 -04:00
StevenLawson 9f889efa76 -Make /saconfig clean a "Telnet Senior" command only. 
-Move some TwitterBot stuff around.
 2013-09-27 08:46:42 -04:00
StevenLawson 1e79b90249 Tweak Wilee999's /cage changes. 2013-09-25 20:46:03 -04:00
StevenLawson 70a24486b8 Merge branch 'pull2' of https://github.com/Wilee999/TotalFreedomMod 2013-09-25 20:39:46 -04:00
Steven Lawson d863a9e274 Merge pull request #85 from Wilee999/pull1 
Change gadmin usage to contain fr
 2013-09-25 17:37:42 -07:00
StevenLawson f49c4568b2 Tweaks to essentials interface commands. 2013-09-24 20:32:04 -04:00
StevenLawson 01807d1f0f Added Essentials interface. 
Moved nick customization commands from Essentials to TFM.
 2013-09-24 10:13:38 -04:00
StevenLawson c5ddc60b97 Cleaned up TFM_Util 2013-09-24 08:05:48 -04:00
StevenLawson 97b27cd7b4 Change tag character limit. 
Now max = 20 characters, not including color codes.
TFM_Util.colorise() -> TFM_Util.colorize()
 2013-09-21 13:58:16 -04:00
StevenLawson faeaa3aab7 Update for MC v1.6.4 
Other minor fixes
 2013-09-21 13:51:09 -04:00
StevenLawson e10ab45bda Update NanoHTTPd to https://github.com/NanoHttpd/nanohttpd/commit/12b4973a5265890754904c75f5eeb6ef1b29373a 2013-09-17 21:31:46 -04:00
StevenLawson 7b59350833 Tweak Wilee's changes to /onlinemode. 2013-09-17 12:05:53 -04:00
StevenLawson 927e46a431 Revert "Wrapped rollback with a Callable to make sure that it executes on the Bukkit thread." 
This reverts commit 65ba053aee.
 2013-09-15 20:38:54 -04:00
StevenLawson 65ba053aee Wrapped rollback with a Callable to make sure that it executes on the Bukkit thread. 
Saw this in a log:

java.util.ConcurrentModificationException
	at java.util.ArrayList$Itr.checkForComodification(ArrayList.java:819)
	at java.util.ArrayList$Itr.next(ArrayList.java:791)
	at me.StevenLawson.TotalFreedomMod.TFM_RollbackManager.rollback(TFM_RollbackManager.java:94)
	at me.StevenLawson.TotalFreedomMod.Commands.Command_gtfo.run(Command_gtfo.java:51)
 2013-09-15 14:11:36 -04:00
StevenLawson 81ee5f04dd Register permbans module (whoops). 2013-09-14 22:15:30 -04:00
StevenLawson ded31e4640 Add /cbtool and /setlever, commands geared toward Command Blocks. 2013-09-14 22:00:11 -04:00
StevenLawson 1416429910 Add permbans module for HTTPd. 2013-09-14 21:59:11 -04:00
StevenLawson 8cdff6a3c1 Rework /expel command. 
Move TFM_LandmineData out of main package.
 2013-09-13 22:13:07 -04:00
StevenLawson 8ba477140b Added /localspawn - Teleport to the spawnpoint for the current world instead of the global spawnpoint. 2013-09-13 14:57:33 -04:00
Steven Lawson 18e4943216 Finish /config command. 
Fix typo: ALLOW_FLIUD_SPREAD -> ALLOW_FLUID_SPREAD
 2013-09-07 22:51:12 -04:00
Steven Lawson 549c5231e8 Added /config command. 2013-09-07 22:10:05 -04:00
Steven Lawson 7144894848 Enable /saconfig clean for all telnet users. 2013-09-07 21:16:35 -04:00
StevenLawson fef5f7604b Nitpicking. 2013-09-05 10:48:57 -04:00
StevenLawson 2d421178db This doesn't need to be Serializable anymore. 2013-09-05 10:33:06 -04:00
StevenLawson 650bd11ab0 Rework protected areas. 2013-09-05 10:22:59 -04:00
Steven Lawson 05ad222148 Moved the trigger for validateSelection into TFM's WorldEdit. 2013-09-04 18:20:52 -04:00
StevenLawson 4cde6a53ba Started work on WorldEdit protected area support. 2013-09-04 15:17:22 -04:00
StevenLawson 18ed009ddd Added a comment about frontdoor. 2013-09-04 11:27:20 -04:00
StevenLawson b7efe3983d Reworked event listener registration in Front Door. 2013-09-04 11:09:23 -04:00
StevenLawson eb01c0db86 Removed use of Guava class. 2013-09-04 09:48:16 -04:00
StevenLawson 562e354f37 Standardized use of apache commons lang3 instead of lang. 2013-09-04 08:35:12 -04:00
Steven Lawson b845ff3f7e Tweak filename rule. 2013-09-03 21:03:40 -04:00
Steven Lawson 3c9245bfaf Finished schematic manager module. 
Todo: Deuglify the user interface of it.
 2013-09-03 20:27:58 -04:00
Steven Lawson 4bef1a06a4 More http server tinkering. 2013-09-03 17:47:42 -04:00
Steven Lawson e70f8ffff3 Shouldn't create new instances of a list when we can just clear it. 2013-09-03 17:18:03 -04:00
Steven Lawson 896af4198a ... 2013-09-03 16:49:48 -04:00
Steven Lawson d1ffbe0412 Merge branch 'waiting' into staging 2013-09-03 16:41:21 -04:00
Steven Lawson 8f70fa2c82 Merge branch 'untested' into staging 2013-09-03 16:41:12 -04:00
Steven Lawson a89948f76d Javascript support 2013-09-03 16:35:11 -04:00
StevenLawson 41cca7cd6a Working on schematic uploader. 
Sorry for not branching out on this, but its almost done.
 2013-09-03 15:20:28 -04:00
StevenLawson 0067e2cc65 Added socket parameter for access to remote IP. 
Started on schematic module.
 2013-09-03 10:28:56 -04:00
StevenLawson 88103cefc2 Some more tweaks to WebHelp. 2013-08-28 11:26:08 -04:00
Steven Lawson 3819c57adf Finished file serving module (default). 
Added config options.
 2013-08-27 20:20:11 -04:00
StevenLawson c3f8bd33ff Added file module, for public file serving. 2013-08-27 15:09:07 -04:00
StevenLawson baf7a3b2c1 Merge branch 'master' into nanohttpd 2013-08-27 13:56:21 -04:00
StevenLawson 74bfdad389 ... 2013-08-27 13:55:03 -04:00
StevenLawson 08a9329864 Web help refinement. 2013-08-27 13:49:45 -04:00
StevenLawson be87075337 Rename help module. 2013-08-27 12:40:59 -04:00
StevenLawson ada803cd7d Web help roughly implemented. 2013-08-27 12:39:28 -04:00
StevenLawson 0f31ea2953 Make it thread safe. 2013-08-27 09:01:12 -04:00
StevenLawson 3ca46853ac Merge branch 'master' into nanohttpd 2013-08-27 08:02:32 -04:00
StevenLawson ee6b93e208 Playing the memory reduction game - lets reduce the use of "new". 2013-08-27 07:46:25 -04:00
StevenLawson 3e5e11197f Merge branch 'master' into nanohttpd 2013-08-27 07:18:43 -04:00
Steven Lawson 174043fa58 Getting HTTP server framework ready... 2013-08-26 21:48:04 -04:00
Steven Lawson dfb6df63c8 Use NanoHTTPD instead, more stable. 2013-08-26 20:39:30 -04:00
Steven Lawson 7a6cc55640 Clean up EntryType 2013-08-26 19:09:39 -04:00
Steven Lawson 5c61ff27b0 Formatting 2013-08-26 18:44:18 -04:00
Steven Lawson 143b323854 Implement weather and time control in /adminworld. 2013-08-23 21:22:13 -04:00
Steven Lawson 1f32455e06 A few more adminworld checks. 2013-08-23 16:59:31 -04:00
Steven Lawson f5e21f69fd More guest list changes. 2013-08-23 16:29:46 -04:00
StevenLawson bf7877addc Finish guest list. 2013-08-23 14:43:58 -04:00
Steven Lawson 6d0b8362b7 Merge branch 'master' into adminworld 
Conflicts:
	appinfo.properties
	buildnumber.properties
 2013-08-22 17:08:52 -04:00
Steven Lawson 10f905ea36 Got rid of varargs in logger, possible cause of exceptions. 2013-08-22 16:56:17 -04:00
Steven Lawson e64fd42855 Added TFM_CustomWorld superclass. 2013-08-21 20:07:14 -04:00