SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,456 Commits 7 Branches 34 Tags 82 MiB
23b92e1246
Commit Graph

303 Commits

Author SHA1 Message Date
Trent Hensler
1e2a6b34b4 Send titles when entering faction territory. 
Allows users to pick which, if any, or all, ways of sending faction enter messages from: scoreboard, chat, and titles.
Adds new config.yml options and lang messages.
 2018-03-16 10:08:19 -07:00
Trent Hensler
1ede2b35d6 Color the perm set command 2018-03-11 19:43:30 -07:00
Dariasc
819cb542cd Major f perm fix; Fix sethome permission check (#1079) 2018-03-09 10:22:15 -08:00
Dariasc
693c831327 Add Admin and Permission check to /f perm (#1062) 
* Remove perms Action

* Add Permission check to /f perm

* Refactor flight perm

* Add fly perm to GUI

* Remove useless perm check
 2018-03-06 11:46:55 -08:00
_ProSavage_
fe464ba750 Added /f chat mod 2018-03-04 19:21:53 -08:00
Trent Hensler
f65fe27c53 Shallow copy of the map. 
This is why it was setting one perm for all roles and relations.
 2018-03-04 18:53:45 -08:00
Trent Hensler
97784872d2 Try harder to set flags 2018-03-04 18:48:14 -08:00
Trent Hensler
dc59609b36 Don't show attributes on GUI items 2018-03-04 17:57:12 -08:00
Trent Hensler
e95ecbd2a9 Respect canSee in online fplayer count 2018-03-04 17:45:01 -08:00
Trent Hensler
07eb3756e4 Don't take fall damage after flying 2018-03-04 17:27:48 -08:00
Dariasc
a90299d32e Implement /f fly (#1023) 2018-03-04 14:13:32 -08:00
Trent Hensler
aacee63255 Delete warp password when warp is deleted 2018-03-04 13:03:21 -08:00
Trent Hensler
fe51837845 Respect hidden players in f show. Resolves #1049 2018-03-04 12:53:52 -08:00
Dariasc
d6b147ef7b Add /f warp GUI (#1069) 
* Add /f warp GUI

* Fix typo
 2018-03-04 12:53:20 -08:00
Dariasc
a8ce60b457 Add rank check to /f ban (#1068) 
* Add rank check to /f ban

* Fix incorrect f perm check at SetHome
 2018-03-03 19:12:14 -08:00
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
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
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
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
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
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 e91fc8f15af2da855aad881369b26f3bb7ecbc1f.
 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
1b088ccd54 Set warp and f warp f perms 2018-02-03 13:04:21 -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
fb0c77efc0 Add truce to tag util 2018-01-05 00:25:50 -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
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
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
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
769722ddb4 Add decimal format for showing money to TL file 2018-01-02 01:37:12 -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
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
04dd47dfea Add faction exemption to /f show 2016-12-17 00:16:42 +01: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
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
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
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
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
cnr
c68d3e8e2f Remove MPluginSecretServerListener. Fixes #414 2015-09-08 13:12:11 -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
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
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
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
786f2d655f Deprecate Factions#getNone in favor of Factions#getWilderness 2015-07-23 14:39:50 -05: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
Paul Sauve
3ab25c3694 Fix warmup, actually set it 2015-05-25 16:56:50 -05:00
drtshock
de57060819 Revert "Remove Fanciful, fix compilation (part 1/2)" 
This reverts commit fc1d08e5078c40ca36a159cb9d0edd4d67241cbc.
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
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
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
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
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
Nick Porillo
44542261ae Variable overhaul and configurable /f show 2015-05-12 21:34:00 -04:00
Nick Porillo
dbba8c055c Adds Faction founding date 
..but does not implement it. Future commit will need to add this to /f
show.
 2015-05-12 12:20:11 -04:00
Nick Porillo
362bb55a0f Fix relation limit glitch 
Hand merged from HCF. Fixes issue where factions could exceed the max
relation setting in config.
 2015-05-12 12:13:30 -04:00
drtshock
8af57197ce Remove errant format specifier. Resolves #301. 
Bumping to .16-SNAPSHOT so I can post this to spigot and then not deal with this anymore.
 2015-05-02 21:04:35 -05:00
drtshock
57c0c9fd09 Only clear warps if faction is normal and not null. 2015-04-26 00:03:35 -05:00
drtshock
9076e780cf Add method to get all claims for a given faction. 2015-04-26 00:02:30 -05:00
drtshock
d0b514eff6 Fix some lag with f show. Remove offline permission lookups. 
The lookup was locking up my server on almost any f show executions. It's just not worth it.
 2015-04-25 19:15:54 -05:00
drtshock
c3ac0cf1ea Permission for not losing power while offline. 2015-04-22 08:33:43 -05:00
eueln
8354c95a14 Use getOfflinePlayer(UUID) when retrieving groups. Fixes #361 
We were previously using getOfflinePlayer(String), which was not only
blocking, but also being rate limited
 2015-04-14 15:44:14 -04:00
drtshock
ced36df08f Null check when sending scoreboard. Resolves #328. 2015-03-18 08:29:36 -05:00
drtshock
c3452c97aa Add null check before toggling scoreboard. 2015-03-09 23:44:34 -05:00
vemacs
7fd590fc75 Add ToggleAllianceChat command (sorry I couldn't think of a shorter name, but this is extremely useful for YouTubers) 2015-03-04 23:55:46 -05:00
vemacs
50e0bd87a6 Merge remote-tracking branch 'upstream/1.6.x' into 1.6.x 2015-03-04 23:37:39 -05:00
drtshock
607be6b8fb Merge t00ths branch. 2015-02-26 08:59:00 -06:00
vemacs
4484eae5b8 add API to ignore alliance chat 2015-02-25 07:38:03 -07:00
eueln
1daf79c6c3 Fix MemoryBoard#hasFactionWithin implementation 
It was previously only checking for factions diagonally within the
designated radius
 2015-02-20 17:08:29 -06:00
eueln
2b4e1a1947 Gracefully handle the absence of WorldBorder 
Additionally move `isOutsideWorldBorder` to FLocation, because it
doesn't belong in Board/MemoryBoard.
 2015-02-20 17:01:52 -06:00
korikisulda
1d00a0aa54 Yet more TL. Hi @Bonkozorus 2015-02-19 09:10:42 -06:00
Nick Porillo
d69f9e5688 Handle buffers 2015-02-19 08:59:28 -06:00
Nick Porillo
5a9112ad37 Add WorldBorder support 
- Uses API in spigot to get world border
- Blocks faction claims that are outside the world border

Improved border detection

This is the updated border detection, this method is extremely accurate
and does not over partition claim space like before.

Takes the border and divides by two, and then converts the block
distance into a chunk distance.
Ex. Border = 100, Chunks = 6 vertically, 6 horizontally.

We get the absolute value difference between the center chunk and the
claim chunk, for both X and Z. We add both diffs, and if they are
greater than the limit, then we know the chunk is outside the border!
 2015-02-19 08:58:20 -06:00
Nick Porillo
0e76bc05fb Add getLastDeath method 
Also makes lastDeath a private field, since it is not accessed anywhere
else in the plugin,.
 2015-02-11 23:01:13 -05:00
drtshock
63d6d69224 Remove ~ from sendFactionhere message. People can add it in if they want via TL. 2015-02-06 09:17:17 -06:00
drtshock
5579005714 Add buffer zone for areas between Faction claims. Adds #233. 2015-01-29 09:39:56 -06:00
drtshock
559695d103 Fix check for over claiming. Resolves #230. 2015-01-29 08:30:20 -06:00
eueln
fc0b2a1041 Fix path for Relation translations (singular) 2015-01-28 19:58:21 -06:00
drtshock
1636708cef Adds DTR freeze functionality from #229. 2015-01-28 10:13:23 -06:00
drtshock
d888b320db Add DTR (deaths til raidable) option for f show. 
Will show 0 if they are raidable to prevent a negative number from showing.
 2015-01-27 11:07:55 -06:00
drtshock
f92d59e5c6 Add HCF raidable functionality. 
This will allow players to break blocks in factions that are raidable (power < claims) as well as open chests. It can also disable over claiming.
 2015-01-27 11:02:16 -06:00
drtshock
147a051fee Add max relation type. Adds HCF feature from #169. 
If used, max relation should be set to -1 for the default relation.
 2015-01-27 09:34:22 -06:00
drtshock
092d4b352c Add ability to display if Faction is raidable. Resolves #167. 2015-01-27 09:06:18 -06:00
eueln
3c0c835160 Fix TL path for /f save success message 2015-01-23 19:48:49 -06:00
korikisulda
5ea8392fd5 Even moar TL 2015-01-23 15:09:47 -06:00
drtshock
3e6bd4e88a Add f top command functionality. Resolves #71. 
Gives the ability to see top Factions on the server sorted by certain criteria:
Balance: sorts by faction bank balance and all faction member balances.
Power: total power.
Land: total land claimed.
Online: members currently online.
Members: total members, online and offline.

Future criteria can be added of course.
 2015-01-23 09:07:18 -06:00
drtshock
ebf00ccf0d Add claim line. Resolves #142. 2015-01-22 22:38:46 -06:00
drtshock
8c2f08b694 Truces. 
Add chat channel functionality. Essentially the same as Allies except it's a different word.
 2015-01-22 20:30:40 -06:00
eueln
a943f47abb Init built-in factions after loading from disk 2015-01-21 19:45:49 -06:00
korikisulda
7e6aa4fc25 Even more TL. Fixes command description issues. 2015-01-21 19:25:45 -06:00
korikisulda
1cc544db64 moar translatify :3 
Add some missing TL nodes
Remove Lang class
You can now into changing command descriptions
 2015-01-20 13:58:38 -06:00
korikisulda
3d52704c5d Changed TL to use numbered strings 2015-01-20 13:52:44 -06:00
Joshua Popoff
355e1f58b0 Add warmups for /f home and /f warp 2015-01-19 15:59:15 -08:00
eueln
c1752477c7 Save last-known FPlayer names 
Instead of performing a lookup each time FPlayer#getName() is called,
save the player's name as s/he logs in
 2015-01-13 16:37:59 -06:00
eueln
2955370c9e Fix misleading error in CmdKick 
The error was shown to a player when s/he tried to kick someone who
didn't belong to a faction, and incorrectly asserted that something had
"went wrong".
 2015-01-10 11:32:56 -06:00
drtshock
8103f953eb Allow chat spying to persist. 2015-01-06 16:08:58 -06:00
drtshock
8300b2ff2b Allow players to monitor joins and leaves of their faction members. 
Larger servers tend to have join and leave messages disabled for the entire server. A few have requested to allow faction members to monitor join and leave messages of their own members.
 2015-01-06 16:06:46 -06:00
eueln
d36e88f2c0 Correctly remove faction warps in unclaimed land 2015-01-06 11:59:15 -06:00