Commit Graph
100 Commits
Author SHA1 Message Date
Olof Larsson 92116bc929 Fix some warnings in Eclipse 2012-02-22 19:08:17 +01:00
Olof Larsson c74e4baab2 Minor change to support NoCheat protection 2012-02-05 19:51:51 +01:00
Olof Larsson 37169dc6ec Added command logging as for default commands and temporairly removed Essentials old features as it does not compile in Eclipse :/ sorry about this. How would we go about getting this compile in Eclipse and Netbeans at the same time? 2012-02-05 18:55:26 +01:00
Olof Larsson 0abc3f397a Using latest CAPI for integration 2012-01-31 21:14:05 +01:00
Olof Larsson d3645d3c95 Merge branch 'master' of github.com:MassiveCraft/Factions 2012-01-28 19:49:16 +01:00
Olof Larsson fafad0f590 Improved the seechunk command. 2012-01-28 19:49:01 +01:00
Olof Larsson 87dc76716e deleted an unused import. 2012-01-28 19:09:50 +01:00
Olof Larsson 8a13cd8cdc reverting the revert (sorry) 2012-01-28 19:00:13 +01:00
Olof Larsson ba760b69ae Reverting... wtf 2012-01-28 18:10:19 +01:00
Olof Larsson c248d419bb Panic fix to remove infinite loop 2012-01-28 17:15:20 +01:00
Olof Larsson 7575cfcafc merege fix 2012-01-28 17:03:47 +01:00
Olof Larsson dfb36a9e43 Noted a possible npe 2012-01-28 17:02:18 +01:00
Olof Larsson 92bddb0f9a Add optional essentials integration for /f home delay and cooldown (enabled by default). 2012-01-27 22:22:32 +01:00
Olof Larsson ea03124c31 Merge branch 'master' of github.com:MassiveCraft/Factions 2012-01-11 23:02:33 +01:00
Olof Larsson ea80f325ec a' 2012-01-11 23:01:59 +01:00
Olof Larsson f0627017b5 Found a bug I did NOT FIX. 2012-01-04 00:30:07 +01:00
Olof Larsson 81d24ecbc4 Leaders can now not be kicked by their officers. Improved leader command. 2011-12-23 01:13:55 +01:00
Olof Larsson 3dc70e82d9 Unused imports cause warings in eclipse. 2011-12-18 22:47:48 +01:00
Olof Larsson 0bbb7ddfdd Merge pull request #61 from sp1ky/master
Power regeneration rate increase as power decreases
2011-12-16 02:41:05 -08:00
Olof Larsson 1e1925b43e Performance boost? And fixed capi integration once again. 2011-12-16 00:19:01 +01:00
Olof Larsson 2c5a8872f2 Fixed capi integration 2011-12-15 16:49:47 +01:00
Olof Larsson e9c8988ec6 Fix for containers 2011-12-04 22:48:30 +01:00
Olof Larsson d9bfd7d38b Protecting noteblocks and blocking warp command from enemy territory. 2011-12-04 19:49:50 +01:00
Olof Larsson 8661672f14 Adding jukebox as a container. 2011-12-03 22:30:49 +01:00
Olof Larsson 3d929138a5 Removed debug output. 2011-11-27 23:52:15 +01:00
Olof Larsson 87e7dd52d7 Merge branch 'master' of github.com:MassiveCraft/Factions 2011-11-27 23:13:58 +01:00
Olof Larsson b4ea5228ec Backwards compat for Dynmap-Factions 2011-11-27 23:13:43 +01:00
Olof Larsson 5db20e9625 Added radius claim 2011-11-27 22:47:40 +01:00
Olof Larsson bf2ff7f0ed Allies can build per default. 2011-11-27 19:21:24 +01:00
Olof Larsson 5b64a62f6b Added protection to cauldron and brewingstand. Updated bukkit library. 2011-11-27 19:18:00 +01:00
Olof Larsson 907492e8f7 MassiveCraftCore update 2011-11-25 21:09:03 +01:00
Olof Larsson 686986eeb9 Fixes to the show command. 2011-11-24 16:53:59 +01:00
Olof Larsson fc6bfcf061 Merge branch 'master' of github.com:MassiveCraft/Factions 2011-11-24 16:27:23 +01:00
Olof Larsson e935a56ff9 New SeeChunk command and cleanup of the show command. 2011-11-24 16:27:14 +01:00
Olof Larsson c43d34af79 Fix the nofaction wilderness invuln bug. 2011-11-06 09:20:03 +01:00
Olof Larsson da15de2b52 moderator -> officer rename in messages in the officer command. 2011-11-06 09:12:38 +01:00
Olof Larsson 9c678965be The special factions must be closed. 2011-11-05 11:15:37 +01:00
Olof Larsson 7ab784f02e Another reason to be saved 2011-10-26 14:50:34 +02:00
Olof Larsson f76311c492 Claiming now works again :P 2011-10-25 22:18:54 +02:00
Olof Larsson 72db45e45e Updated readme, Fixed admin bypass command and corresponding permissions, Swapped colors for ally and truce, added new faction permissions, improved explosion protection and implemented firespread protection, fixed painbuild check order, flags can only be changed by server admins now and implemented type adapters for some enumerations for future changes to be non breaking. That it \:D / 2011-10-25 21:18:08 +02:00
Olof Larsson 57c4b70dad Merge with master 2011-10-25 17:52:14 +02:00
Olof Larsson ee59a904a0 Removed line from help 2011-10-25 17:49:52 +02:00
Olof Larsson 451d9570e4 The friendlyfire flag now works 2011-10-24 14:54:37 +02:00
Olof Larsson 8eec55e37e asdf 2011-10-24 13:02:48 +02:00
Olof Larsson 5f437b1862 Changed permission view. Bank withdraw permission in the works 2011-10-24 11:56:41 +02:00
Olof Larsson 99e8acd79f Streamlined the faction arg descriptores 2011-10-24 11:11:53 +02:00
Olof Larsson 0c46809952 Some refactoring and better messages 2011-10-24 11:07:06 +02:00
Olof Larsson bb5a676430 Changes to the ascii map and minor tweaking 2011-10-24 09:28:08 +02:00
Olof Larsson 1ec7842ed4 Removed the strange usage of selective saving and implemented a good simple one. 2011-10-24 03:15:08 +02:00
Olof Larsson 074be07510 Some dead code elimination 2011-10-24 03:02:25 +02:00
Olof Larsson 46161f61db Started to implement special faction behavior 2011-10-24 02:33:30 +02:00
Olof Larsson e3821a8d4e REMOVED owned plots 2011-10-24 01:37:51 +02:00
Olof Larsson 958a1e0d9f Working permdelta parser 2011-10-23 23:38:26 +02:00
Olof Larsson 371261a07f Working on the faction perms as well now 2011-10-23 23:17:02 +02:00
Olof Larsson 21783ef9d4 Woop 2011-10-23 22:08:57 +02:00
Olof Larsson ac6870b770 Merge with master 2011-10-23 20:53:56 +02:00
Olof Larsson 98c5230655 Wheeerp 2011-10-23 20:50:49 +02:00
Olof Larsson 842844969b Merged Relation and Role into one enum 2011-10-23 17:55:53 +02:00
Olof Larsson e6ff84ad9a Merge branch 'master' into seven 2011-10-23 17:31:30 +02:00
Olof Larsson d280f9409d In the middle of refactoring to merged role and relation as one enum 2011-10-23 17:30:41 +02:00
Olof Larsson 4f7fd6dd96 Possibly solved the faction creation issue. Changed the best id match to something more reasonable 2011-10-23 12:07:20 +02:00
Olof Larsson 32624e0339 Fixing a string format error and possibly solving a money rights issue 2011-10-23 02:43:25 +02:00
Olof Larsson 2ac96f4278 Added a permanent power command 2011-10-22 18:12:15 +02:00
Olof Larsson 7ebed6db9c Improving the faction tag matching 2011-10-22 17:42:13 +02:00
Olof Larsson 75cd9b5e18 Indentation fixes and comment cleanup 2011-10-22 17:18:44 +02:00
Olof Larsson a78a4dff98 Managed to get rid of some commands. This needs to be rethought even more though. 2011-10-22 17:03:49 +02:00
Olof Larsson 45d6a6628a Claim command refactoring in progress. 2011-10-22 16:00:24 +02:00
Olof Larsson 5bf38ab0aa Adding match mode for id search to MassiveCraftCore and improving the faction argument readers. 2011-10-22 14:39:01 +02:00
Olof Larsson e6d45a6aa2 Spout overlay support is missing for the new relation coloring. Otherwise done. 2011-10-21 20:08:54 +02:00
Olof Larsson 89b53a577a Missed one 2011-10-21 19:23:05 +02:00
Olof Larsson 46f5849f9f Moving over to the use of describeTo. 2011-10-21 19:20:33 +02:00
Olof Larsson 51161bbb55 Adding a couple of admin bypass commands. 2011-10-21 18:20:31 +02:00
Olof Larsson f42fb8e8bf Removing some old code and try to read colors in the listeners. 2011-10-21 18:14:04 +02:00
Olof Larsson aad9819ae9 herp 2011-10-16 12:12:49 +02:00
Olof Larsson 3d33088f47 Merge branch 'master' of github.com:MassiveCraft/Factions 2011-10-16 11:58:21 +02:00
Olof Larsson 3de70b6db8 Changes to the default configuration 2011-10-14 23:45:39 +02:00
Olof Larsson 04074bc2b4 Minor changes 2011-10-14 15:40:03 +02:00
Olof Larsson 00f6f4ab05 Support for the CAPI plugin. 2011-10-14 15:03:23 +02:00
Olof Larsson 3967579884 Merge branch 'master' of github.com:MassiveCraft/Factions 2011-10-13 22:49:52 +02:00
Olof Larsson 618c5fceed Fixed a bug with the smoke effect for the faction home and one NPE. 2011-10-13 22:49:41 +02:00
Olof Larsson 88fe43d600 Using PEX 1.15 and only as superpermsmanager to allow for use of the parent permission. Also changed the handling of money on faction leave as last player. 2011-10-13 19:47:37 +02:00
Olof Larsson 98260c75de Bugfixes and awesome probably complete money commands. 2011-10-13 16:07:07 +02:00
Olof Larsson 0888e027ad Econ messages improved. All money commands is now under the money parent command. 2011-10-13 14:41:07 +02:00
Olof Larsson 0039370f05 Some effect for the f home teleport command 2011-10-13 12:17:23 +02:00
Olof Larsson f575ad6bc0 Factions are not removed properly... this needs to be sorted out before release 2011-10-12 21:54:38 +02:00
Olof Larsson f25daa228a Some of the bugs are fixed. 2011-10-12 18:48:47 +02:00
Olof Larsson 2566edfd8c Merged some changes 2011-10-12 17:28:00 +02:00
Olof Larsson b202acb685 Almost finished money refactoring 2011-10-12 17:25:01 +02:00
Olof Larsson b0e31eb837 Supressed warnings in eclipse 2011-10-11 13:03:33 +02:00
Olof Larsson 6ab7e10d1f Merge branch 'master' of github.com:MassiveCraft/Factions 2011-10-11 13:01:12 +02:00
Olof Larsson d07639e7ee Added a register event convenience method 2011-10-11 13:00:53 +02:00
Olof Larsson 7b5124529a Added some extra blocked commands 2011-10-10 22:45:15 +02:00
Olof Larsson 80d132af70 Added forgotten type adapters. 2011-10-10 14:21:22 +02:00
Olof Larsson 1d44aa0c9c Renamed sendMessageParsed to msg 2011-10-10 13:40:24 +02:00
Olof Larsson aceeea8b0e Fixed better color handling system 2011-10-10 13:31:25 +02:00
Olof Larsson e402797c54 Removing the small ugly language file 2011-10-10 01:59:36 +02:00
Olof Larsson 27c45bf7f3 Fixed who command and detatched the argument reading a bit. 2011-10-10 01:43:21 +02:00
Olof Larsson 3cc7766fa7 Some bugs fixed. 2011-10-10 01:21:05 +02:00
Olof Larsson a5c8e2de49 glerp 2011-10-09 21:57:43 +02:00
Olof Larsson 3cdd5764d3 derp 2011-10-09 20:10:19 +02:00