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

574 Commits

Author SHA1 Message Date
Naman
76d1bc0e9b SavageFactions 1.0.23 
Ability to remove items from main menu in perms for choosing roles/relations by setting the slot to -1
Changed placeholder identifier back because hooks in many plugins broke :(
Removed debug message from warzone fly.
Changed public modifiers on relation back, as they broke the method signature.
 2018-04-07 16:31:13 -05:00
Naman
f1bfe2e8c4 SavageFactions 1.0.21-BETA-3 
Tweaked fly disabler, hitting mobs wont disable it.
Fly bypass permisssions logic redone
issues with safezone fly and warzone fly fixed
Fixed click to claim in f map
Changed tooltips ot one line in map because of heavy load in areas with lots of claims
option to disable banners
Kicking throwing error cause of typo in lang file.
Tnt Bank limit added.
 2018-04-03 22:20:30 -05:00
Naman
009e3e715c SavageFactions 1.0.21-BETA-2 
Fixed tnt message
New message for fly disable to show cooldown
Started on remaking lang file
fly will not disable when an ally, truce, or faction member hits you.
Role prefix value added to placeholderapli class
changed identifier for placeholderapi
Made 1.7 detection
Placing blocks wont throw errors anymore in 1.7.
 2018-04-03 09:38:11 -05:00
Naman
12b9f94fe4 removed the iterator in fly checks. 
...
 2018-04-01 09:13:23 -05:00
Naman
21587db74d Iterator Fix in Fly to avoid concurrent exceptions 
1.12 particle support
 2018-03-31 11:46:37 -05:00
Naman
e14af238bf SavageFactions 1.0.21 
fixed this error (https://pastebin.com/4gtiQPYX)
 fixed damage bug (https://pastebin.com/56JHiPYt)
 fixed (https://prnt.sc/iy4l7q) (( I think I did, I could not replicate it ))
 Added methods to check if players can fly in claim types e.g.
 "if (fplayer.canflyinsafezone()){
 //do stuff
 }"
 Autofly now enables if you have bypass permissions.
 Fixed faction members, truces, and allies being able to hit each other and disable fly
 Fixed Autofly's enable message spamming multiple times if fly is already on.
 2018-03-30 21:22:06 -05:00
Naman
cdf870b782 Added Invalid Location to checkpoint 
Fixed Checkpoint cooldown
Made it so you have to buy vaults from /f getvault, and buy banners from /f banner
Particle based seechunk that works when moving between chunks
Particle support for 1.7-1.12
Made fly particles mode subtle
 2018-03-28 19:33:10 -05:00
Naman
3d2bf73497 Option to remove permissions from perm gui. 
bStats tracking
Admins are demoted coleaders instead of mods
Changed fly for loop to iterator to avoid concurrent exceptions
 2018-03-27 08:17:55 -05:00
Naman
b92202e86b Promote, kick, and admin command bugs fixed. 2018-03-26 18:42:26 -05:00
Naman
44b3de91dd adding new stuff 2018-03-26 16:43:15 -05:00
Trent Hensler
382f4c4b0c Check fly on teleport. Fixes #1099 2018-03-20 19:24:21 -07:00
Trent Hensler
1567df7311 If f perm is not set or undefined, allow server owners to define default f fly access in the conf.json. Adds #1100 2018-03-20 19:19:24 -07:00
Trent Hensler
20cd874026 Format 2018-03-20 10:08:27 -07:00
Ryan
fc3473e83a Use PlaceholderExpansion instead of EZPlaceholderHook to support relational placeholders (#1095) 2018-03-20 10:06:42 -07:00
Trent Hensler
a45833944b Allow warzone and safezone to be colored in f map 2018-03-19 23:00:47 -07:00
Trent Hensler
55c546e951 Remove debug 2018-03-18 20:38:59 -07:00
Trent Hensler
f1032e7a2e Make sure players take fall damage. 
Not sure why we need to set this on join when it defaults to true. Debugged and didn't find anything modifying it otherwise. /shrug
 2018-03-18 20:35:07 -07:00
Trent Hensler
bd077e8c32 Check for null or empty on homes 2018-03-18 20:17:59 -07:00
Trent Hensler
54a35929e6 Hide attributes in relation as well 2018-03-18 20:13:05 -07:00
Trent Hensler
c88e04a806 Hide attributes in role items 2018-03-18 20:10:50 -07:00
Trent Hensler
64dc70b717 Properly send title and subtitle 2018-03-18 20:07:05 -07:00
Trent Hensler
760f16a2b7 Disable claimat for now 2018-03-18 19:39:47 -07:00
Trent Hensler
a4581ac9a0 Allow all faction members to fly if f perm is undefined 2018-03-18 19:37:19 -07:00
Trent Hensler
026b33b427 Don't even load /f fly if its set to false in config. 2018-03-18 14:37:55 -07:00
Trent Hensler
587182478b Add option to delete essentials homes when players are kicked from Factions. Adds #1089. 
This option is set to true by default in the config.yml for new users, users that are updating need to add delete-ess-homes: true to their config.yml to get this new option enabled.
 2018-03-18 14:11:42 -07:00
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
8950be61d1 Option to not always show chat tag. 
Fixes the issue of not being able to have groups without a faction tag in their name.
 2018-03-13 23:41:15 -07:00
Trent Hensler
d7646516ec Check for perms after checking if it's a server faction 2018-03-12 21:06:53 -07:00
Trent Hensler
3e83916682 Failsafe for door check 2018-03-11 19:52:25 -07:00
Trent Hensler
1ede2b35d6 Color the perm set command 2018-03-11 19:43:30 -07:00
Trent Hensler
999067a430 Allow show to be ran from console even if we can't fill in all placeholders 2018-03-11 18:31:06 -07:00
Dariasc
f85d2a0a17 Fix GSON Map Serialization (#1081) 
* Add backwards compatibility for permissions that were placed in dev builds.
 2018-03-11 18:29:02 -07:00
Trent Hensler
b78ff51e10 Allow console to run /f list 2018-03-11 17:59:11 -07:00
Trent Hensler
4531da8190 Move f perm checks up 2018-03-10 16:26:18 -08:00
Trent Hensler
2291554e1e Faction create event is no longer cancellable, and is called AFTER the faction is made. This allows people to hook into the event and manipulating the Faction without having a delay. And if the event was ever cancelled before, it was silent. 2018-03-09 22:08:17 -08: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
ff37d0c241 More colors 2018-03-04 18:25:26 -08:00
Trent Hensler
dd010333a7 Hide flags in warp gui too 2018-03-04 18:24:09 -08:00
Trent Hensler
dc59609b36 Don't show attributes on GUI items 2018-03-04 17:57:12 -08:00
Dariasc
77f7704ab4 Implement blank wilderness placeholder (#1070) 2018-03-04 17:48:13 -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
Trent Hensler
055adf2e9e Don't enable our own f top command if other plugin that handles it is enabled. Resolves #1066 2018-03-04 16:46:17 -08:00
Trent Hensler
47eb14c845 Give factions.fly to kithalfplayer 2018-03-04 14:16:59 -08:00
Trent Hensler
f1905d04a3 factions.fly as the perm node 2018-03-04 14:16:17 -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
fa007e5674 Add Role prefix placeholder (#1067) 2018-03-03 18:48:02 -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
2f20ef810f Update default faction balance tag in f show. Fixes #1055 2018-03-02 10:58:02 -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
56214ad661 Note where we support placeholders 2018-02-17 12:29:30 -06: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
5a5d947e35
Merge pull request #1002 from GrizzsChannel/patch-1 
Add resource link in config.yml
 2018-02-10 18:10:11 -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
538936c284 Revert "Default f perm perm to true" 
This reverts commit be3d423e83.
 2018-02-05 21:52:21 -07:00
Trent Hensler
be3d423e83 Default f perm perm to true 2018-02-05 21:43:23 -07: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
GrizzsChannel
2f9939ebd4
Add resource link in config.yml 2018-01-14 14:44:36 -05: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
f73825af92
Merge pull request #949 from emanh1/patch-1 
Fix typo
 2017-12-19 00:17:14 -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
EmanhMC
b1c83ff345 Fix typo 
Fix typo at line 47 (changed Factoins [or something else lol] to Factions)
 2017-07-16 18:49:11 +07: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