Commit Graph

502 Commits

Author SHA1 Message Date
Dariasc 6f55243a80 Fix NullPointer at GUI onClick() (#1064) 2018-03-03 18:39:44 -08:00
Trent Hensler a42d4d1d50 Handle null config section to be more friendly with people upgrading 2018-03-02 19:07:34 -08:00
Trent Hensler 81a33de33a Format and check for null section 2018-03-02 13:57:36 -08:00
Dariasc d490bb8366 F Perm GUI (#1045) 2018-03-02 13:53:01 -08:00
Trent Hensler 6af634d4e3 Check for null 2018-03-02 10:55:52 -08:00
Trent Hensler acc41bf07a Call method, not local, for role. Fixes #1059 2018-03-02 10:54:42 -08:00
Trent Hensler 634917d4c4 Format 2018-03-01 23:32:17 -08:00
Corey Shupe 6eb7e7a558 Fixed top level permission addition.
Bug where only the last known addition to the permission map would actually be added, moved map declaration outside of nested for loop and put the permissible setting outside as well to stop ridiculous amounts of calls to it.
2018-03-01 23:29:13 -08:00
Trent Hensler f8774bab23 Check for less than 1 2018-03-01 23:12:42 -08:00
Trent Hensler 10f2e4a977 Check for no mapheight for w/e reason 2018-03-01 22:56:42 -08:00
Trent Hensler 6cb02126f4 Check for null role.
Resolves: #1047 #1048 #1041
2018-03-01 22:15:44 -08:00
Trent Hensler c4a56de3b7 Compile against PlayerVaultsX 2018-03-01 18:54:14 -08:00
Trent Hensler 151d38fd7b Faction Bans
Adds /f ban, /f unban, and /f banlist
Permission: factions.ban - included with factions.kithalfplayer
Also added as a /f perm that can be granted. Otherwise, defaults to faction mods.
Number of bans now shows up in f show
Banning a player will notify your faction and target player. It'll also kick the player from your faction if they are currently in it.
TODO: make /f banlist prettier
2018-02-28 20:23:37 -08:00
Lax 34fc475819
Use deprecated API for backwards compability
Fixes #1051
Fixes #1044

Web editor ain't that bad btw.
2018-02-24 18:03:19 -08:00
Trent Hensler ca0991504b Set placeholders in main scoreboard too 2018-02-17 12:21:15 -06:00
Trent Hensler d45b5ac612 Add placeholders to f show 2018-02-17 12:17:37 -06:00
Trent Hensler 3f1edf1096 Allow players to set titles with colors. Adds #1036.
factions.title.color permission which is included in factions.fullplayer permission subset.
2018-02-15 18:02:59 -08:00
Trent Hensler ab7f474323 Make mapheight and width configurable 2018-02-13 10:55:03 -08:00
Trent Hensler f29efa116d Clickable f map
* New command /f claimat world x z
* Permission: factions.claimat
* Permission is not included in factions.halfplayer or anything for now. Will need to be granted manually.
* If players don't have factions.claimat, they won't see the clickable f map
2018-02-12 18:09:02 -08:00
Trent Hensler ea7213cbd7 Fix sethome perm check 2018-02-12 10:59:45 -08:00
Trent Hensler a034030ba5 Fix setting perms.
Annoyingly setting them to und by default now
2018-02-11 17:38:04 -08:00
Trent Hensler 9f8c2e3905 Revert "Don't set perms to undefined by default"
This reverts commit e91fc8f15a.
2018-02-11 17:22:25 -08:00
Trent Hensler 5e7b14f132 In line compass 2018-02-10 17:35:25 -08:00
Trent Hensler d8125eb0d2 Max mapheight is 2x default 2018-02-10 17:03:31 -08:00
Trent Hensler 9bd193df72 Separately customizable f map tooltips 2018-02-10 16:57:18 -08:00
Trent Hensler 0f6bd8eabd Fix default mapheight 2018-02-10 16:27:49 -08:00
Trent Hensler 50930d7583 Bigger /f map
Add /f mapheight <height> command to allow players to set their mapheight.
Increase default map height and width to be in line with larger values servers want
2018-02-10 16:20:13 -08:00
Trent Hensler 3c4168a1dd Missed diff 2018-02-10 16:04:05 -08:00
Trent Hensler 47f0bf1ce5 Tooltips in f map 2018-02-10 15:59:21 -08:00
Trent Hensler e91fc8f15a Don't set perms to undefined by default 2018-02-05 21:34:55 -07:00
Trent Hensler 79410d91f1 Command to view your permissions 2018-02-05 20:46:53 -07:00
Trent Hensler 41bdc25441 Fix permission persistence 2018-02-05 20:46:43 -07:00
Trent Hensler 32b13befce Add container f perm 2018-02-03 14:08:21 -08:00
Trent Hensler 1b088ccd54 Set warp and f warp f perms 2018-02-03 13:04:21 -08:00
Trent Hensler ad10222c2d Withdraw f perm 2018-02-03 13:01:25 -08:00
Trent Hensler 925014bd60 f perm for kick 2018-02-03 12:59:05 -08:00
Trent Hensler baea59a1cd F perm for invite and sethome 2018-02-03 12:56:16 -08:00
Trent Hensler 3eda8750cc Format 2018-02-03 12:50:12 -08:00
Trent Hensler 182022fe5f Check for f perm in building 2018-02-03 12:49:04 -08:00
Trent Hensler 9384b0faa6 Check for null 2018-02-03 12:38:36 -08:00
Trent Hensler 249770d2cd Add Permissable interface for f perm compatibility.
Allows Roles and Relations to be permissable, so we can set f perms for both of those in the same map.
2018-02-03 12:33:28 -08:00
Trent Hensler 9e8205b5e2 Work with PlayerVaultsX 2018-01-31 17:03:55 -08:00
Trent Hensler 8484f92030 Use Lang for roles 2018-01-31 16:49:19 -08:00
Trent Hensler 9f08e6580b Fix some other f perm checks 2018-01-20 16:53:09 -08:00
Trent Hensler 246b93bda9 Allow null instead of throwing exception. Fixes #1008 2018-01-20 16:50:38 -08:00
Trent Hensler c465d0c9d4 Add suppport for MVdW placeholder API 2018-01-06 16:56:43 -08:00
Trent Hensler af9fc526d7 Allow the use of placeholders in scoreboards 2018-01-06 14:04:42 -08:00
Trent Hensler fb0c77efc0 Add truce to tag util 2018-01-05 00:25:50 -08:00
Trent Hensler 79d4a885f8 Allow bulk setting of permissions 2018-01-04 23:16:24 -08:00
Trent Hensler 39f1bd7404 Fix permissions 2018-01-04 23:01:52 -08:00
Trent Hensler 4110fb2ef4 Fix up default role and promote commands 2018-01-04 18:10:49 -08:00
Trent Hensler 5c2abb34de Format. Haven't done this in awhile. Just sneak it in. 2018-01-04 17:40:27 -08:00
Trent Hensler f019c4f833 Don't let them set default to admin 2018-01-04 17:38:29 -08:00
Trent Hensler f6bd156f89 Add command to set default rank. Only used by admins.
/f defaultrole <role>
2018-01-04 17:37:23 -08:00
Trent Hensler 4db185e3ee Role updates.
* Adds recruit role below the normal role.
* Adds /f promote and demote. Access to this command defaults to moderator if not set in /f perm
* Default role is still set to recruite. Will have to /f demote to set players to that rank.
2018-01-04 17:17:30 -08:00
Trent Hensler b84535f3ee Update log message 2018-01-04 15:45:33 -08:00
Trent Hensler 896bf489b7 Add method to deserialize the custom map 2018-01-04 15:44:39 -08:00
Trent Hensler c367a9cb09 Make faction announcement borders configurable 2018-01-04 14:41:14 -08:00
Trent Hensler 7a4ddc6855 Actually allow setting of truce 2018-01-04 01:47:36 -08:00
Trent Hensler 687bac31db Initial f perm.
TODO:
* Add GUI for viewing and changing permissions.
* Currently no way to view access for all perms.
* Test this because I didn't.
* Finish implementation of all permissions, add more.
2018-01-04 01:36:51 -08:00
Trent Hensler 8fee985e99 Actually set factionless prefix in chat. Fixes #979 2018-01-04 00:32:25 -08:00
Trent Hensler c3e1e6547a Consistent naming 2018-01-04 00:07:51 -08:00
Trent Hensler e343ac69fa Add lots of placeholders 2018-01-04 00:06:30 -08:00
Trent Hensler ff8ae7be3b Check for sender in f money ff. Fixes #993 2018-01-03 23:32:19 -08:00
Trent Hensler 769722ddb4 Add decimal format for showing money to TL file 2018-01-02 01:37:12 -08:00
Trent Hensler fe7002f674 Initial placeholderAPI support.
Give me ideas on what else to add and I'll add it.
2017-12-30 18:44:42 -08:00
Trent Hensler 3b644cd6c3 Java 7 and make intellij happy 2017-12-19 02:18:13 -08:00
Trent Hensler ce132ed033 Add password protected warps 2017-12-19 02:10:52 -08:00
Trent Hensler 9ed7603e38 Fix showing the faction's balance in f show instead of the player who executed it. 2017-12-19 00:37:17 -08:00
Trent Hensler 3bce7ae619
Merge pull request #761 from Techcable/fix/null-gson
Make P.gson final
2017-12-19 00:20:37 -08:00
Trent Hensler c30137c34d
Merge pull request #904 from markhughes/1.6.x
Allow using FLocation object in canClaimForFactionAtLocation
2017-12-19 00:19:08 -08:00
Trent Hensler 190908b181
Merge pull request #921 from ExpDev07/1.6.x
Removed duplicate/unnececary code in DiscUtil.
2017-12-19 00:18:15 -08:00
Trent Hensler 0b9f2dd7dd
Merge pull request #963 from XXLuigiMario/allow-unclaimall-world
Allow unclaiming all safezones and warzones in a specific world
2017-12-19 00:16:57 -08:00
Joel Puig Rubio 08c0995741 Allow unclaiming all safezones and warzones in a specific world 2017-09-04 23:17:12 +02:00
Joel Puig Rubio 75db3fcad3 Allow admins to claim for wilderness 2017-09-04 23:14:42 +02:00
U-NIFLHEIM\Lax 9b7279af14 1.12 update 2017-06-21 22:23:08 -07:00
DoggyCode 68597da958 Removed duplicate/unnececary code in DiscUtil. 2017-04-26 16:56:17 +02:00
Mark Hughes af7b48c522 Allow using FLocation object in canClaimForFactionAtLocation 2017-02-13 18:21:28 +11:00
Kakifrucht 208434972f Also exempt from /f list 2016-12-17 02:06:44 +01:00
Kakifrucht 04dd47dfea Add faction exemption to /f show 2016-12-17 00:16:42 +01:00
Kakifrucht a255114808 Update to 1.11, ensure we pass a double 2016-12-13 17:08:28 +01:00
novucs d2e3e7c18c Fire unclaim event when unclaiming
Claim events fire even with bypass mode enabled, so the same functionality should apply for unclaiming.
2016-07-25 15:07:03 +01:00
Kakifrucht eb503fdfa8 Fix formatting codes in description 2016-06-29 19:10:07 +02:00
Techcable b118d4d18c Make P.gson final
Before it could be null, triggering weird issues.
2016-06-25 15:23:21 -07:00
Kakifrucht 5721473a16 Only send frostwalker message every 10 seconds 2016-06-12 22:54:38 -05:00
Trent Hensler a7aeb26fd0 Check build permissions on frostwalking. Resolves #708. 2016-06-10 16:43:48 -07:00
Kakifrucht c30aa34fb7 Correct logging behaviour 2016-06-07 16:47:32 +02:00
Trent Hensler 830ffff022 Auto leave log message to debug mode. 2016-06-01 09:19:29 -07:00
Trent Hensler 74b4bd33e9 Add option for setting default max vaults of a faction. 2016-05-30 17:21:11 -07:00
Trent Hensler f8ee2a5506 Remove chat spy and admin bypass on login if player no longer has permission.
Resolves #636 and #705.
2016-05-30 16:45:46 -07:00
Trent Hensler 9f89010af1 Add /f vault description. 2016-05-30 16:25:27 -07:00
Trent Hensler 0294a60675 Add Faction vaults.
These can be accessed with /f vault <number>
Set a Faction's max vaults with /f setmaxvaults <faction> <number> - can be run from console so Buycraft can execute it.
* This is a not very tested implementation. Should be tested more in depth before being pushed to a release.
2016-05-30 16:22:45 -07:00
Troy Frew 46805200dd Fixed /f unclaim and /f unclaim 1 2016-05-30 13:00:53 -04:00
Trent Hensler efb5d335f6 Add ability to bypass auto leave for FPlayers. Implements #659.
Permission is factions.bypassautoleave
2016-05-29 17:33:46 -07:00
Trent Hensler 14946cd1b2 Add /f unclaim <radius> per #684. 2016-05-29 17:20:50 -07:00
Gabriele C bd416059bc Cleanup 2016-05-03 23:05:18 +02:00
ItsMonkeyyy 90f3e0140d Commands are no longer CaSe-SeNsAtIvE which was a very annoying "issue" with the current build of Factions 2016-02-25 20:28:01 -08:00
Mark Hendriks d558ec37f0 Change chat event priority to LOW
Factions has always been an egotistical bastard regarding chat and command interception. An example use case is muting players.
2016-02-19 10:37:36 +01:00
gsand a85728cd21 Additional aliases for common commands 2016-01-01 19:05:02 -08:00
ItsMonkeyyy 8b6cf4fe8c Added a feature to enable or disable broadcasting tag changes 2015-12-10 19:05:42 -08:00
drtshock 1cf2158021 Add option to reset powerboost from #572.
Functionality is now /f powerboost p <name> 0 or reset to set the powerboost to 0 for that player or faction.
2015-12-02 16:26:06 -08:00
drtshock bc2d7c35f6 Make sure faction is normal when checking relation on commands. 2015-09-23 12:04:16 -05:00
cnr f5432cd227 Add missing forward-slash prefix to clickable commands. Fixes #401 2015-09-11 23:04:53 -05:00
cnr c68d3e8e2f Remove MPluginSecretServerListener. Fixes #414 2015-09-08 13:12:11 -05:00
drtshock 11bd632b15 Add option to disable explosions in peaceful territory from #369. 2015-09-08 12:55:42 -05:00
drtshock 47bdb149ab Add factionless prefix. Fixes #438. 2015-09-08 12:42:05 -05:00
drtshock c5571ba8ee Add command to forcefully send player to f home from #478.
Functionality: /f ahome <target> - sends a player to their f home as long as they have an f home and are online.
Permission node is  and given to factions.admin and factions.*
2015-09-08 12:18:00 -05:00
drtshock d916e97d0d Add option for over claim reward from #498. 2015-09-08 12:04:20 -05:00
drtshock 11757be50d Check correct config option for over claiming. 2015-09-08 11:51:20 -05:00
drtshock 4414b1589f Remove deprecated isNone usages in favor of isWilderness 2015-09-08 11:46:48 -05:00
drtshock 088c6e11b1 Add options to block commands in wilderness and ally territory. Adds #514 2015-09-08 11:39:21 -05:00
vemacs 1fa2abcc88 Resolve NPE on /f warp with cooldown 2015-09-07 08:00:58 -06:00
cnr 6181f08da3 Disable chunk ownership messages in the Wilderness. Fixes #520 2015-09-01 13:47:23 -04:00
eueln 9de87fc2a2 Fix CME when cleaning Factions from the board. Fixes #515 2015-08-28 13:42:21 -04:00
Harry5573 0ede00f7df Optimize common MemoryBoard operations
This reduces the complexity of:

1. retrieving the total chunks owned by a faction, and
2. removing a faction from the board.
2015-08-26 17:02:34 -04:00
drtshock 05cbf4cf5d Powerboost now adds to the current powerboost instead of sets it. Adds #501
This will break existing functionality but that existing functionality is stupid.
2015-08-08 21:53:31 -05:00
drtshock 518eba9e18 Check for pay before passing teleport off to essentials. 2015-08-07 16:39:07 -05:00
drtshock 3db1d5fdb3 Improve concurrency with help from @evilmidget38 2015-08-07 15:03:22 -05:00
drtshock 1a94e89558 Initial async saving on auto save and force save. 2015-08-06 17:41:37 -05:00
drtshock f76fc190fd Don't readd wilderness faction to f top. Fixes #470 2015-08-06 17:30:50 -05:00
drtshock ce77799ef1 Add minimal f show. 2015-08-06 16:59:54 -05:00
drtshock 3b8bc19460 Add faction and player kills / deaths stats. 2015-08-06 16:53:00 -05:00
drtshock bf0382ca76 Add newline and {null} support for player messages. 2015-08-06 16:35:49 -05:00
drtshock 76e6fd2765 Add factionless sidebar. 2015-08-06 16:34:01 -05:00
drtshock 8926d0b434 Don't allow % in faction descriptions.
Was messing up string formatting. Fixes #490
2015-08-06 16:09:07 -05:00
drtshock 786f2d655f Deprecate Factions#getNone in favor of Factions#getWilderness 2015-07-23 14:39:50 -05:00
vemacs 03cc7f7394 Perform a null check for teleport cooldowns to prevent exceptions when players log out before cooldown 2015-06-13 16:18:42 -06:00
drtshock fbbf352120 Check for style. 2015-06-12 18:43:59 -05:00
drtshock 91877c9d59 Check for style or color when parsing fancy colors. 2015-06-12 16:33:43 -05:00
drtshock 644e1ec8fb Scoreboards default to true and more player tags. 2015-06-08 02:01:21 -05:00
drtshock e7f8060441 Don't show home location by default.
This was in there for HCFactions and isn't really meant for regular factions.
2015-05-25 19:16:46 -05:00
Paul Sauve 3ab25c3694 Fix warmup, actually set it 2015-05-25 16:56:50 -05:00
drtshock 7205c0012d Apparently it didn't revert correctly. 2015-05-25 15:53:48 -05:00
drtshock de57060819 Revert "Remove Fanciful, fix compilation (part 1/2)"
This reverts commit fc1d08e507.
We have users on builds before this was included in Spigot. We don't want to break those servers.
2015-05-25 15:46:18 -05:00
Paul Sauve 1481d604d4 Cancel warmup on damage or movement 2015-05-25 12:20:33 -05:00
Paul Sauve fc1d08e507 Remove Fanciful, fix compilation (part 1/2) 2015-05-24 18:05:27 -05:00
drtshock 2ad527b85b Don't send spy messages to spyers who are the ones sending the message. 2015-05-19 15:57:02 -05:00
drtshock 0285c005dd Update f version command. 2015-05-18 14:34:45 -05:00
drtshock f69f1cc025 Use FPlayer to store board toggle instead of separate file.
Honestly not sure why we ever did it like this in the first place.
2015-05-18 14:32:12 -05:00
drtshock 7a2dcca067 Check for warzone and safezone when claiming.
Helpful when claiming a warzone or safezone after renaming either.
2015-05-14 10:36:03 -05:00
drtshock ec202c0fbf Use original values for balance tags.
Lots of reports of no balance showing up.
2015-05-14 09:02:35 -05:00
Nick Porillo 6d17855586 Fix interact TL issue. Resolves #374
http://puu.sh/hLqXh/7aef61a7a0.png
2015-05-13 01:04:53 -04:00
drtshock f37e38b011 Reformat. 2015-05-12 23:17:22 -05:00
Nick Porillo 4e17d43c91 Add configurable faction enter/leave message 2015-05-12 23:25:28 -04:00
Nick Porillo d7067d3f27 Add /f stuck command to root
forgot to commit this
2015-05-12 23:24:08 -04:00
Nick Porillo fede341cc7 Implement /f stuck command from hcf 2015-05-12 23:16:47 -04:00
Nick Porillo aeef4d69c2 Fix last seen variable 2015-05-12 23:14:51 -04:00
Nick Porillo 6921dd1796 Fully configurable /f help
defaults to legacy /f help
implements hcf's configurable /f help system
2015-05-12 22:09:52 -04:00
Nick Porillo 46f4f3b7ac Fix variable typo
{lastSeen} is what we should use as it is legacy.
2015-05-12 22:05:32 -04:00
Nick Porillo a068583678 Add default faction description TL
implemented from hcf with love <3
2015-05-12 21:49:27 -04:00