TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-07-13 15:54:46 +00:00
Code Issues Projects Releases Wiki Activity
594 commits 7 branches 35 tags 8.2 MiB
Commit graph

521 commits

Author SHA1 Message Date
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
JeromSar 3da03393e6 Small bugfix with the logblock stick 2013-08-26 17:48:19 +02:00
JeromSar 5876f86ac3 Added logblock stick 2013-08-26 17:22:35 +02:00
JeromSar fbdf2b5fc2 More /cage tweaks 2013-08-26 15:12:06 +02:00
JeromSar fd6aa7b94b Tweaks to /cage 2013-08-26 01:08:53 +02:00
JeromSar 5981f7f33f Converted variable names to CamelCase as convention 2013-08-25 18:32:01 +02:00
JeromSar 55d94b5d59 Changed back to raw Lists in config 2013-08-25 17:32:24 +02:00
JeromSar d71b043102 Added unbannable usernames (defined in config) 
Changed all raw Lists in config to StringLists
 2013-08-24 21:35:09 +02: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
Jerom van der Sar 8718b3a8c2 Merge pull request #73 from Wild1145/patch-7 
Removed Disaster from Developer access
 2013-08-23 13:49:10 -07: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
Ryan dcb6a4513e Removed Disaster from Developer access 
Noticed this when working on the CJFreedom version, thought it should be removed!
 2013-08-22 20:29:16 +01:00
unknown ff4751941b Working on guestlist 2013-08-22 15:26:12 -04:00
Steven Lawson e64fd42855 Added TFM_CustomWorld superclass. 2013-08-21 20:07:14 -04:00
Steven Lawson 467d1d2d3a Merge branch 'master' into adminworld 2013-08-21 18:38:17 -04:00
Steven Lawson 6ba8dcaa58 Logger fixes. 2013-08-21 17:42:21 -04:00
Steven Lawson a3cf53f5b1 Merge branch 'master' into adminworld 2013-08-20 20:51:23 -04:00
Steven Lawson 23907ef7e4 Use plugin/server loggers. 2013-08-20 20:44:39 -04:00
Steven Lawson 485945047b More logger tweaks. 2013-08-20 20:04:06 -04:00
JeromSar 75ec2330f5 Incremented version number, changed startup logic 
Improved logging, small changes
 2013-08-20 17:35:00 +02:00
Steven Lawson 5c32c66390 Finish getting rid of old command blocker. 2013-08-18 16:45:35 -04:00
Steven Lawson 4494a4c039 Config migration, stage 3 2013-08-18 15:52:32 -04:00
Steven Lawson f53b67abf1 Config migration, stage 2 2013-08-18 15:27:17 -04:00
Steven Lawson 2827ca98a7 Config migration, stage 1 2013-08-18 14:52:46 -04:00
Steven Lawson 64b1e568b3 Deprecated old config vars 2013-08-17 18:28:55 -04:00
Steven Lawson 3e57696a21 Delegate to TFM_ConfigEntry 2013-08-17 18:24:40 -04:00
Steven Lawson fd1bd995ed Another version of TFM_ConfigEntry... 2013-08-17 18:07:57 -04:00
Steven Lawson 9fe05add7f Added weather parameter to framework. 2013-08-16 21:36:25 -04:00
Steven Lawson 25fbb0c05a Merge branch 'master' into adminworld 2013-08-15 17:45:41 -04:00
Steven Lawson f646a5122a Fixed wilee's glitch. 2013-08-15 17:44:09 -04:00
Steven Lawson af4071c582 Framework for new adminworld commands. 2013-08-15 17:40:35 -04:00
Steven Lawson 86ee0e96d2 Add TFM_Util.isRemoveCommand 2013-08-15 17:36:55 -04:00
Wilee999 26bcd3ec1c Changes to /tban 2013-08-14 13:54:54 -07:00
JeromSar 122bef2d5a DromedaryCase 2013-08-14 16:55:37 +02:00
JeromSar 339518f4f4 Take two: Cleanup 2013-08-14 16:01:42 +02:00
StevenLawson 8ce0defb52 Readd Command_premium.java 2013-08-14 09:32:14 -04:00
StevenLawson ec6e8431e3 Revert "Added /premium" 
This reverts commit 0964871e8b.
 2013-08-14 09:28:19 -04:00
JeromSar 0964871e8b Added /premium 
cleanup
 2013-08-14 15:12:30 +02:00
Steven Lawson 422a7716f3 /nf tweaks. 2013-08-13 21:39:12 -04:00
Steven Lawson f1ab8296e4 Tweaks to jumppad physics. 2013-08-13 16:54:20 -04:00
StevenLawson f9cbf11abb JumpPads cleanup 2013-08-13 14:53:33 -04:00
StevenLawson b0090a5412 More tweaks to nonuke and spam prevention. 2013-08-13 13:42:43 -04:00
StevenLawson b94efb525f Added timeout check to nonuke, so lag doesn't ban people. 2013-08-13 13:22:29 -04:00
StevenLawson 5c8f98089e Merge branch 'master' into mg_untested 2013-08-13 12:29:12 -04:00
JeromSar 7879fa24e4 Minor changes to JumpPads 2013-08-13 18:21:37 +02:00
JeromSar 6fcaed6253 Finished Jumppads 2013-08-13 17:16:33 +02:00
JeromSar 656dbf8867 Started work on Jumppads 2013-08-13 16:08:00 +02:00
StevenLawson 23032e6f9a Added NickFilter. 2013-08-13 09:51:20 -04:00
StevenLawson ad5a236bc2 PlayerMoveEvent optimization. 2013-08-13 08:36:33 -04:00
Steven Lawson e23db244a5 Add teleport listener to AdminWorld monitor. 2013-08-12 22:01:28 -04:00
Steven Lawson eb4622fc28 AdminWorld tweaks. 2013-08-12 21:33:21 -04:00
JeromSar 0f6b053727 Added /findip 2013-08-12 21:35:59 +02:00
JeromSar 259335958a Merge branch 'master' of https://github.com/TotalFreedom/TotalFreedomMod 2013-08-12 20:54:35 +02:00
JeromSar 31375b82c3 Tweaked /tag some more, I think this will work best. 2013-08-12 20:54:19 +02:00
StevenLawson 0a2d5c8258 Reworked /dtoggle. 2013-08-12 14:49:33 -04:00
JeromSar bac25258b0 Added /lockdown 2013-08-12 20:47:36 +02:00
Ryan c69918d725 Create Command_dtoggle 
This is a replacement for DisdFreedom dtoggle, something we had to add on CJFreedom shortly after we lost his plugin :)
 2013-08-12 19:28:41 +01:00
StevenLawson c1d0c01524 Merge branch 'master' of https://github.com/TotalFreedom/TotalFreedomMod 2013-08-12 14:19:33 -04:00
StevenLawson a59e6added Tweaks to Command_tag 2013-08-12 14:19:17 -04:00
Jerom van der Sar 56493adcae Merge pull request #67 from Wild1145/patch-4 
Block Op's from using &k.
 2013-08-12 10:59:52 -07:00
StevenLawson 4b91de7414 More AdminWorld tweaks. 2013-08-12 12:51:30 -04:00
StevenLawson c636ee043a Merge branch 'mg_incomplete' of https://github.com/TotalFreedom/TotalFreedomMod into mg_incomplete 2013-08-12 12:41:12 -04:00
StevenLawson 6a5306dd7a More AdminWorld tweaks. 2013-08-12 12:38:46 -04:00
Ryan 4603dc5613 Block Op's from using bad codes 
This will block a op from using a set of colour codes you to not want them to use, like &k
 2013-08-12 17:10:08 +01:00
JeromSar af7e6c5d41 AdminWorld welcome sign now facing the right direction :) 
Added teleporting message to /adminworld
 2013-08-12 17:58:28 +02:00
StevenLawson 41ed416a51 Merge branch 'master' into mg_incomplete 2013-08-12 10:05:01 -04:00
StevenLawson 074630f720 Finished adminworld, still needs testing. 2013-08-12 10:03:12 -04:00
JeromSar 4e3c9a6b9e Batch format fix 2013-08-12 14:41:04 +02:00
StevenLawson bea480c1f1 Merge branch 'master' into mg_incomplete 
Conflicts:
	appinfo.properties
	buildnumber.properties
 2013-08-12 08:14:55 -04:00
JeromSar 69fd3566af Added /tag clearall and /tag clear <name> 2013-08-12 12:50:39 +02:00
JeromSar f3ac19a616 Added /tag 
Minor cleanup
 2013-08-12 12:31:30 +02:00
JeromSar 696ec119c6 Made /saconfig clean a senior command 2013-08-12 11:24:23 +02:00
Steven Lawson 326c3f6a2b Incomplete features: 
-Adminworld
-Better entity wiping
 2013-08-11 22:02:18 -04:00
Steven Lawson 38b1035020 Added Command_trail. 
+1 points for no external changes.
 2013-08-10 15:50:45 -04:00
Steven Lawson 1ae6eb8a5a Consolidate loggers. 2013-08-10 15:50:07 -04:00
Steven Lawson 2c4eca8551 Remove deprecated methods and variables. 2013-08-10 13:17:32 -04:00
Steven Lawson f23c61d0b3 Rework Command_health 2013-08-10 12:39:50 -04:00
Steven Lawson d4dfe06ec0 Formatting cleanup. 
Added ignore for unchecked cast warning.
 2013-08-09 20:11:17 -04:00
JeromSar bcd9658b3d Added release link to permban kick message 2013-08-09 17:57:45 +02:00
JeromSar 9b62731e94 Merged branch unfinished 2013-08-09 17:11:30 +02:00
JeromSar 03553b6254 Finished TFM_ServiceChecker, added /services 2013-08-09 17:09:13 +02:00
JeromSar d40c143afc Reworked /health, should be thread-safe now 
Updated version number to reflect latest changes
 2013-08-09 15:40:08 +02:00
JeromSar 95afb51321 Moved rollback events to listener with MONITOR priority 2013-08-09 15:10:04 +02:00
Steven Lawson 4813b8ae27 Fix water/lava buckets not working. 2013-08-06 19:12:26 -04:00
Steven Lawson e8d36b31f7 Fix typo. 2013-08-05 22:55:59 -04:00
Steven Lawson b2eec1ef01 Rework command interface for rollback. 2013-08-05 22:05:01 -04:00
Steven Lawson 3bcc4fd7a7 Fix compile error. 2013-08-05 19:41:42 -04:00
StevenLawson e0efb63123 Reworked rollback manager. 2013-08-05 15:26:21 -04:00
StevenLawson 028d1a07b2 Minor change to CommandBlockSetEvent handler. 
Remove import and add fully qualified name to clairify what's happening here.
 2013-08-05 13:31:10 -04:00
Jerome van der Sar 5b34facdd3 Started work on ServiceChecker 2013-08-04 20:49:43 +02:00
Steven Lawson 218fd21774 Some cleanup. More to come. 2013-08-03 16:08:16 -04:00
Steven Lawson 0901c02c7e Merge branch 'mg_dev' 2013-07-30 21:47:50 -04:00
Steven Lawson a4e9bc76a3 Add "Reason: " text to kick. 2013-07-30 21:47:29 -04:00
Steven Lawson be8314cf63 Added TFM_GameRuleHandler for easy setting of game rule parameters. 2013-07-29 21:09:20 -04:00
StevenLawson f21c7aa5c5 Added reason to GTFO. Untested. 2013-07-29 14:44:18 -04:00
StevenLawson 3f61e05609 Make "/fr purge" clear the auto-unfreeze task timer. 
With credit to Wild for bringing it up on his fork, but he did it wrong :P
 2013-07-29 13:37:31 -04:00
StevenLawson fe93d1ce07 Added /logs [off] for unregistering connection. 2013-07-29 13:20:08 -04:00
StevenLawson 5132bb6550 Removed old commented out code. 2013-07-29 08:29:16 -04:00
Steven Lawson 6b7a5d8d70 Add /debug command. What can possibly go wrong. 2013-07-28 20:50:57 -04:00
Steven Lawson 6a4a11a2f4 Merge remote-tracking branch 'origin/debug' 2013-07-28 19:50:05 -04:00
Steven Lawson cbe7cdc474 Cleanup Command_droptoggle. 2013-07-28 17:49:41 -04:00
Steven Lawson 07f4bf82ea Incomplete - /debug command 2013-07-28 17:31:41 -04:00
Wilee999 8e7c9dcd8e Added /droptoggle 2013-07-28 12:39:09 -07:00
Steven Lawson 1ab74dae05 Forgot to set task variable. 2013-07-28 13:15:51 -04:00
Steven Lawson 8ac91f7097 Reworked all Scheduler usage - now using BukkitRunnables. 
Added /logs command.
A few other fixes...
 2013-07-27 17:49:25 -04:00
Steven Lawson c482349f47 TFM_CommandBlockerNew cleanup. 2013-07-26 19:48:18 -04:00
unknown b24f1d9247 Moved the ServerListPingEvent from TFM_PlayerListener to TFM_ServerListener. 2013-07-24 11:01:43 -04:00
Steven Lawson 2079e0ea66 Added event handling for command block changes. 
Recoded TFM_CommandBlocker as TFM_CommandBlockerNew, will replace after evaulation.
 2013-07-21 22:48:34 -04:00
Steven Lawson c3fc085adc Fix for Bukkit NPE in /enchant. 2013-07-20 19:38:27 -04:00
Steven Lawson aad8f17455 Give TFM commands priority over other plugins. 2013-07-20 16:06:46 -04:00
Jerome van der Sar fdfa30b349 How do I allman? 2013-07-14 14:10:29 +02:00
Jerome van der Sar e56c273457 Moved TotalFreedomMod-related information to /tfm 2013-07-13 22:11:13 +02:00
Jerom van der Sar 53614d174e Dry - Fixed all commands having a default '/' alias. 2013-07-13 12:49:53 +02:00
Jerom van der Sar 37e78dceec Merge branch origin/master 2013-07-12 21:54:43 +02:00
Jerom van der Sar 8f6d71fffb Bleeding - Fixed empty commands 
Empty commands would always run the first alphabetically sorted TFM command.
 2013-07-12 21:51:03 +02:00
Steven Lawson b9bd046105 Changed WorldEdit API access method. 2013-07-11 20:35:09 -04:00
Steven Lawson 1fcda4a8fc Merge remote-tracking branch 'origin/untested' 2013-07-11 18:40:42 -04:00
Steven Lawson f8e62a9893 Merge branch 'master' of https://github.com/TotalFreedom/TotalFreedomMod 2013-07-11 18:22:12 -04:00
Steven Lawson aaf96d00a9 Revert to old login logic. Ban messages weren't working right. 2013-07-11 18:21:23 -04:00
unknown 4903f009b3 Add Pet Protection. 
Cleaned up config file a bit.
 2013-07-11 14:51:08 -04:00
Steven Lawson 279f69e3de Merge pull request #52 from Wild1145/patch-1 
Fine by me.
 2013-07-11 04:36:13 -07:00
Steven Lawson 22bf0c2f62 Removed Command_minecraft and TFM_ServiceChecker. 
Restored old Mojang status checker in /status.
Owner of xpaw.ru requested that 3rd party applications not use his API.
Batch formatting fix.
 2013-07-10 21:46:29 -04:00
Jerom van der Sar f21e50e002 Fixed bug in /halt 2013-07-10 23:47:21 +02:00
Jerom van der Sar 6d9e9406ec Moved to more specific User-Agent in the service Checker 2013-07-10 23:32:31 +02:00
Steven Lawson cd16c7fb10 Mark wanted /list -a to show how awesome he was. 
Or something like that. Don't do this for other people, please.
 2013-07-08 20:51:23 -04:00
Steven Lawson 11c945c504 Update to 1.6.2 API. 2013-07-08 20:37:02 -04:00
Steven Lawson c70e3ad8fd Added DisguiseCraft API functionality. 2013-07-07 21:42:03 -04:00
Ryan f63805cca2 Removed some ziptool stuff 
Well as it was removed from here, it may aswell just be removed from this file too :)
 2013-07-07 23:39:02 +01:00
Jerom van der Sar 5868540cbb Optionally ends with 'y', who knew? 2013-07-06 19:09:32 +02:00
Jerom van der Sar 8ca518528f Whoops, fixed the description of /whohas 2013-07-05 14:02:43 +02:00
Jerom van der Sar 4cbbf10871 Blocked command aliases from being executed when that command is blocked, removed debug message 2013-07-05 13:50:10 +02:00
Jerom van der Sar 93914370a1 Added /whohas 2013-07-04 23:32:11 +02:00
Jerom van der Sar ee87d1147d Merge branch 'master' of https://github.com/TotalFreedom/TotalFreedomMod 
Conflicts:
	appinfo.properties
	buildnumber.properties
	src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
 2013-07-04 22:51:31 +02:00
Jerom van der Sar 44f72815e1 Added configurable blocked commands 2013-07-04 22:46:51 +02:00
Steven Lawson 391e417882 Move server interface where it belongs. 2013-07-04 12:22:02 -04:00
Steven Lawson 0dca359e4c A few little fixes. 
Make /cake give the cake achievement.
Fix /lockup.
Colorful MOTD, more MOTD options.
 2013-07-04 12:10:08 -04:00
Steven Lawson 15fbd0e1f3 Got rid of dispatchCommand usage (where possible). 
Added TFM_WorldEditBridge.
 2013-07-03 16:11:57 -04:00
Steven Lawson 1d9e6ae931 Merge pull request #50 from Wilee999/master 
Blocked /butcher and //butcher on mark's request
 2013-07-02 19:41:16 -07:00
Wilee999 a0cf0e9352 oops 2013-07-02 19:40:18 -07:00
Wilee999 797de66e10 removed 2013-07-02 19:36:59 -07:00
Steven Lawson d40d5b461d Cleaned up Command_setl. Don't use server.dispatchCommand for things that can be done with the existing API! 
Fixed depreciation warnings on compile.
 2013-07-02 19:08:31 -04:00
Jerom van der Sar 8751e0454c Cleaned up /purgeall and /halt 2013-07-02 22:31:05 +02:00
Wilee999 3f29f788d5 Bye bye /butcher! 2013-07-02 12:50:59 -07:00