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
Brettflan
136b69b07f
Swapping money commands back to using EconomyParticipator instead of Faction/FPlayer
2011-10-23 13:14:51 -05:00
Brettflan
f8f3704cd4
Additional logging, with new conf.json settings to enable/disable logging of specific events:
...
"logFactionCreate": true, - log faction creation
"logFactionDisband": true, - log factions being disbanded, by command or by circumstance
"logFactionJoin": true, - log player joining a faction
"logFactionKick": true, - log player being kicked from a faction
"logFactionLeave": true, - log player leaving a faction
"logLandClaims": true, - log land being claimed (including safe zone and war zone)
"logLandUnclaims": true, - log land being unclaimed (including safe zone and war zone)
"logMoneyTransactions": true, - log money being deposited, withdrawn, and otherwise transferred in relation to faction banks
Also a fix for a potential NPE from players logging out and Spout appearance handler referencing them afterwards
2011-10-23 12:50:02 -05:00
Olof Larsson
842844969b
Merged Relation and Role into one enum
2011-10-23 17:55:53 +02:00
Brettflan
46cae5a664
Updating help info a bit
2011-10-23 10:41:47 -05: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
Brettflan
83f690c9c5
Fix for unclaimall command not working if Economy was disabled
2011-10-23 10:04:36 -05:00
Brettflan
3e8faad156
Updated Spout features to improve consistency (of code, and of displayed information)
2011-10-23 09:03:28 -05: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
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
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
Brettflan
38e128010c
Fix for /f permanent and /f peaceful commands giving an NPE if run from console
...
Fix for rare NPE when Spout territory info update is run and affected player disconnects at precisely that moment
Clarified "cannot attack neutral faction" messages to indicate enemy status is needed
Updated Bukkit lib to correspond with CB 1337
2011-10-20 18:08:55 -05:00
Brettflan
e3284a5ee1
Fix for /f money command not being shown in help, and some other minor cleanup
2011-10-16 09:11:29 -05:00
Brettflan
f5450886f1
Fix for Bukkit "unknown command" error when using console commands
...
handling for extra commas in "baseCommandAliases" in conf.json adding null values
2011-10-16 04:02:29 -05:00
Brettflan
61bd37c99b
A bit of command help menu cleanup
2011-10-15 12:46:44 -05:00
Brettflan
3981ca4dde
Added fence gates to default "territoryProtectedMaterials" list.
...
Existing users should run these commands to add it to an existing config, if desired:
/f config territoryProtectedMaterials FENCE_GATE
/f config territoryProtectedMaterialsWhenOffline FENCE_GATE
Also changed first letter of "canLeaveWithNegativePower" setting to lowercase, to fit with Java standards. If you had previously changed this setting to false, you'll need to do so again.
2011-10-15 12:46:09 -05:00
Olof Larsson
04074bc2b4
Minor changes
2011-10-14 15:40:03 +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
Brettflan
d7a2a88f95
Merge branch 'master' of github.com:MassiveCraft/Factions
2011-10-13 14:10:04 -05:00
Brettflan
1a38007d64
With Spout, the territory indicator now also has an ownership indicator below it (but only if the current territory has any owners set), and a larger centered territory notice below which goes away after a couple of seconds.
...
These effectively replace the related chat notices if enabled.
Also, updated libs.
2011-10-13 14:09:47 -05: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
Brettflan
4ec086e4fa
Fix for faction creation sometimes causing an NPE; hopefully a fix for the cause of the null value as well, from an ID clash in the entity collection of factions
...
Fix for disband command causing an NPE if run from the console
Additionally, disband command use is now logged
2011-10-13 04:10:29 -05: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
Brettflan
0326a6e938
Fixed ownerlist command (though not sure just why it was failing as written, I need to investigate further), working on restructuring and fixing ownership handling for block placement/destruction/interaction/usage. Will finish that up in the next day or two.
2011-10-11 20:14:59 -05:00
Brettflan
1d8e06796f
fix for /f config not working due to extra blank required parameter
2011-10-10 21:46:59 -05: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
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
