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

268 Commits

Author SHA1 Message Date
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
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
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
ff8ae7be3b Check for sender in f money ff. Fixes #993 2018-01-03 23:32:19 -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
Joel Puig Rubio
08c0995741 Allow unclaiming all safezones and warzones in a specific world 2017-09-04 23:17:12 +02: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
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
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
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
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
cnr
f5432cd227 Add missing forward-slash prefix to clickable commands. Fixes #401 2015-09-11 23:04:53 -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
4414b1589f Remove deprecated isNone usages in favor of isWilderness 2015-09-08 11:46:48 -05:00
vemacs
1fa2abcc88 Resolve NPE on /f warp with cooldown 2015-09-07 08:00:58 -06: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
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
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
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
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
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
f37e38b011 Reformat. 2015-05-12 23:17:22 -05: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
ab6a19e436 Fully configurable /f list 
Implement the configurable f list feature from HCF
 2015-05-12 21:47:22 -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
2b0638f54f Pull out null check because console can have null faction. Fixes #375. 2015-05-07 10:39:04 -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
41d0195c9e Remove unused value. 2015-04-25 14:25:17 -05:00
Evan Lindsay
7b522be2c7 Remove duplicate message for land/power/maxpower 2015-03-31 03:14:20 -07:00
Evan Lindsay
f5b3628bc4 Fix IllegalStateException due to creating a FancyMessage with no args constructor resulting in first MessagePart having no text. 2015-03-31 02:43:05 -07:00
drtshock
c3452c97aa Add null check before toggling scoreboard. 2015-03-09 23:44:34 -05:00
drtshock
6d6b63ba19 Merge branch '1.6.x' of https://github.com/vemacs/Factions into vemacs 2015-03-06 16:35:19 -07:00
vemacs
1ea6dbe12d Fix one type checking warning 2015-03-05 00:16:57 -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
drtshock
607be6b8fb Merge t00ths branch. 2015-02-26 08:59:00 -06:00
Nick Porillo
0aea7c6b9d Remove redundant messaging. Fixes #276 
When informing faction members, if the command sender is part of the
faction, do not send another message to him because he has already been
informed.
 2015-02-20 12:47:48 -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
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
drtshock
0c2253ef73 Iterate over correct Faction for balance. 2015-01-23 09:17:16 -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
a4a11e7045 Allow f show to be executed by non players. 2015-01-22 20:31:26 -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
korikisulda
7e6aa4fc25 Even more TL. Fixes command description issues. 2015-01-21 19:25:45 -06:00
Joshua Popoff
355e1f58b0 Add warmups for /f home and /f warp 2015-01-19 15:59:15 -08:00
drtshock
4d13c9cada Change command syntax for radius claiming. 
Syntax was confusing and people wanted change. Resolves #215.
 2015-01-15 13:27:11 -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
eueln
561ab22924 Remove most mentions of getOfflinePlayer(String) 
Faction bank accounts will need to be migrated to use UUID identifiers
before we can remove the remaining getOfflinePlayer(String) calls.
 2015-01-09 11:44:15 -06:00
mrlolethan
dc3e7e953b Fix "No player found" message in CmdKick 
When `/f kick` was used with zero arguments, an ugly message was sent to
the player regarding a missing player match for "null"
 2015-01-07 18:14:27 -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
5799a0480b Fix String-related bugs 
The result of a call to String#toLowerCase() was ignored, and two
Strings were being compared with ==
 2015-01-06 11:59:15 -06:00
eueln
d6bbea7244 Add missing early return in CmdMod 2015-01-05 10:00:51 -06:00
t00thpick1
44dc04e3e1 There are lots of unfactioned players, but we shouldn't care about them. 2015-01-02 19:19:57 -05:00
drtshock
91f9d1d8db Remove tooltips for f show and f list. 
Tooltips were causing a lot of issues on larger servers. Constructing them as well as the lookups required to display them caused significant lag.

Resolves #197, #164.
 2015-01-02 13:38:35 -06:00
Tibo442
2209090783 Different message for own faction and for other factions when faction not found. 
Still weird for faction-less players to do /f show <other faction-less player>
 2014-12-30 10:07:35 -06:00
t00thpick1
3f949e18cc Lets not do hundreds of object clones when they are nearly never needed. 2014-12-30 00:31:36 -05:00
eueln
c4c5bd9df9 Don't perform /f who for players without a faction 2014-12-29 22:02:18 -06:00
eueln
190c2d793f Use rounded value to match format in /f powerboost 2014-12-24 04:15:16 -06:00
Tibo442
0d75b1164a Changed FancyMessage.command() to accept command aliases. 
Also adds support for servers where slash-less commands are disabled.
 2014-12-19 13:51:24 +01:00
Tibo
728b6b0fbc Fix /f enemy/neutral/ally's message of sender's faction 2014-12-19 13:11:38 +01:00
eueln
3c2e51e8ed Make LandUnclaimAllEvent Cancellable 2014-12-17 20:50:28 -06:00
eueln
3733539077 Add cancellable FactionRelationWishEvent 
This event is called before a faction relation wish is applied by a
player using `/f relation`
 2014-12-17 20:31:21 -06:00
eueln
1ada19b02e Properly split FancyMessages for /f show 2014-12-14 17:24:25 -06:00
korikisulda
10fd3f082a Fixed phantom section. Accursed underscores. 2014-12-14 13:39:45 -06:00
drtshock
9aecd5f439 Reformat. 2014-12-11 10:05:04 -06:00
korikisulda
1ce1eb51d4 Add Japanese translation 2014-12-11 09:46:06 -06:00
drtshock
8788778d05 Expose loadLang as public and reload from disk on /f reload. 2014-12-11 09:16:12 -06:00
drtshock
fa4154a0ce Allow f show to be sent to non-players. 
Fanciful will remove the json formatting to send a readable message.
 2014-12-10 22:36:46 -06:00
drtshock
c9433d0cf3 Send f show messages all at once to remove delay. 2014-12-10 22:32:47 -06:00
eueln
a70cfdaf71 Fix /f {set,del,}warp transactions 2014-12-09 17:16:42 -06:00
korikisulda
1230803cfb Add TL for commands. Resolves #162. Supercedes #97. 2014-12-08 19:47:19 -06:00
eueln
a6585e6f5c Fix /f warp on Java 6 and 7 
Covariance on ConcurrentHashMap#keySet() in Java 8 was to blame.
 2014-12-07 21:59:59 -06:00
eueln
5e676bdd50 Order /f show by rank. Adds #150 2014-12-06 21:44:00 -06:00
korikisulda
6107e9502e Truncate excessively long online/offline player messages in /f show/who. Resolves #154. 2014-12-06 21:23:19 -06:00
eueln
ff2e32feff Fix format in CmdModifyPower message. Fixes #145 2014-11-29 16:29:29 -06:00
drtshock
edfe465ad5 Add missing return statements. 2014-11-17 14:30:41 -06:00
Tibo
356842ab41 Fix clients getting kicked from too many allies/enemies. 2014-11-17 20:16:58 +01:00
Tibo
b970755cb1 Fix spaces with ", " 
Fixes #134
 2014-11-17 19:32:34 +01:00
drtshock
8910de367c Require players to be in a faction to promote. 2014-11-14 14:13:51 -06:00
drtshock
bad874495b Add command to modify a player's power specified in #133. 
use /f modpower name number
 2014-11-14 13:27:23 -06:00
drtshock
104f90c1db Send invite message to correct player. Fixes issue #132 2014-11-14 13:03:51 -06:00
drtshock
54d486cc84 Add tooltips and click commands to f deinvite and show invites. 2014-11-14 10:08:18 -06:00
drtshock
2aa7d7f98d Add tooltips and click commands to f deinvite. 2014-11-14 10:03:57 -06:00
drtshock
03b8f11646 Add tooltips and click commands to f mod. 2014-11-14 09:59:36 -06:00
drtshock
b895fa1e99 Add tooltips and click commands to f kick. 2014-11-14 09:56:13 -06:00
drtshock
656dc90b33 Add tooltips and ability to click to warp when you list faction warps. 2014-11-14 09:46:28 -06:00
drtshock
c4f4036e1d Add tooltips for f show. 
Refactor tooltip methods to be shared across command classes.
 2014-11-13 13:49:13 -06:00
drtshock
43826d986f Add colors to /f list 2014-11-13 12:52:21 -06:00
drtshock
64e234144e /f list tool tips 2014-11-13 12:45:57 -06:00
drtshock
e585ab57a9 Remove unused f list code. 2014-11-13 09:12:34 -06:00
drtshock
201d10ada5 Add economy option for f warps from #126. 2014-11-11 09:28:53 -06:00
eueln
29836a9183 Remove faction team prefixes when disbanded 2014-11-07 12:55:59 -06:00
drtshock
962f92496c Don't allow vanished players to block others from teleporting. Fixes #111. 2014-11-07 12:08:57 -06:00
drtshock
8b64b4bfe1 Adds per faction warps functionality from #72. 
Default max warps per faction is 5. It can be changed in the config.yml.
You can now use {warps} in the info board to show how many warps a faction has when you walk into their territory.
Only faction mods+ can set faction warps.
 2014-11-07 11:49:54 -06:00
drtshock
35813c7210 Reformat. 2014-11-05 18:36:47 -06:00
drtshock
b66c9ad078 Add missing command help to help command. Resolves #101. 2014-11-05 11:34:46 -06:00
eueln
99c582dda8 Fix issues in CmdOpen 
A formatted message was missing a format argument, and comparison on
Strings was being performed with ==
 2014-11-02 01:10:41 -05:00
t00thpick1
ee52016a87 Abstract Data storage method for future implementations. Thanks to Ryan from Reactive MC 
Also included:
-Heavily optimized loading process
-Optimizations for various commands.
 2014-10-30 23:59:59 -04:00
eueln
653f918a1b Add support for Glowstone 
Glowstone doesn't yet support PlayerMoveEvent nor Scoreboards, so
functionality is unfortunately limited.
 2014-10-30 23:26:23 -04:00
eueln
7f2ef4cbd5 Improve Team prefix performance 
This change vastly improves performance for faction team prefix update
operations.
 2014-10-30 23:26:23 -04:00
eueln
c049768e21 Add faction tag to team prefix 2014-10-30 23:26:20 -04:00
Byteflux
51f1ceee14 Show power next to member names in /f show 2014-10-30 23:26:20 -04:00
drtshock
4929e5dd18 Limit block changes sent in seechunk to prevent client freezing. Use prettier blocks. 2014-10-30 23:26:19 -04:00
Byteflux
5569e5076a Add /f seechunk command for visualizing a chunk 2014-10-30 23:26:19 -04:00
eueln
7ada15992b Refactor scoreboard issue. Resolves issue #80. 2014-10-30 23:26:13 -04:00
eueln
25696f32aa Refactor scoreboard usage 
In preparation for team colors, we need to unify scoreboard usage into a
single scoreboard per player.

Rather than creating a new scoreboard for each desired sidebar
objective, we provide an interface FSidebarProvider that allows
implementation-agnostic retrieval of the title and lines of the desired
sidebar, along with appropriate methods in the new implementation of
FScoreboard.

The new FScoreboard implementation manages the currently-visible
sidebar, with methods to set default (non-timed, with update interval)
and temporary (timed, no update interval) sidebars.

Temporary sidebars are replaced with the default sidebar upon
expiration.
 2014-10-30 23:26:04 -04:00
drtshock
bed6fe0741 Add faction announcements to send to all players and show to players when they login if they were not online when it was first sent as requested in issue #82. 2014-10-18 03:54:45 -05:00
drtshock
e290ac0320 Add new permissions to plugin.yml and permission kits. Set scoreboards to enabled per player by default. 2014-10-16 13:35:21 -05:00
drtshock
e20995464e Toggling of scoreboards now affects the default board. 2014-10-15 20:58:37 -05:00
drtshock
4f3310d88f Reload the config.yml on /f reload. 2014-10-15 15:45:20 -05:00
drtshock
2fc17c62b5 Properly persist scoreboard toggles. Fixes issue #61 2014-10-15 15:29:04 -05:00
blha303
9baf297ff7 Add /f status command, closes #70 2014-10-15 12:30:03 -05:00
drtshock
a170a0f4ad /f showinvites for ability to see pending invites for current faction. Adds feature in ticket #76 2014-10-14 13:30:05 -05:00
drtshock
04fd18f17a Add tooltips and commands for f invite command as specified in issue #73. 2014-10-13 14:10:18 -05:00
Ihaveaporpoise
8e248c9ea7 Make reload command only call configuration file. Fixes issue #59 2014-10-05 00:28:00 -05:00
drtshock
0f88e8535d Limit length of f show messages. Fixes issue #44. 
Clients could crash if the messages were too long so we'll limit it here. Thanks to @mccore for the method here.
 2014-08-26 13:05:54 -05:00
drtshock
ddf054330a First implementation of scoreboards. 
Boards can be toggled with /f sb. Toggles are persistent in a yml file.
Also fix some small spelling and format things that were really bugging me.
 2014-08-05 10:17:27 -05:00
drtshock
3298183fdf Add missing javadocs. 2014-07-09 14:01:53 -05:00
drtshock
7604b4455b Don't allow players to be kicked from wilderness faction for whatever reason. Somewhat fixes issue #29. 2014-07-09 13:38:19 -05:00