Commit Graph

406 Commits

Author SHA1 Message Date
JamesFrowen-PC\JamesFrowen ae61303a9b allowing warps to be replaced at max warps 2019-01-18 16:08:51 +00:00
ProSavage 5ca6b7d2d4 Fixed warzone tab autocomplete issue. 2019-01-13 10:23:02 -06:00
ProSavage 7ecc09f64d Fixed /f reload issue, with /f perms 2019-01-06 21:04:38 -06:00
Driftay e14339444c Fixed Disband Exploit 2018-12-29 02:50:44 -05:00
ProSavage bdd547309a First Wave of Skript Support. 2018-12-26 19:22:06 -06:00
ProSavage 7be48b5942 Fixed disband exploit 2018-12-23 18:20:54 -06:00
ProSavage 266c598b76 Fixed the spam issue with a real fix. 2018-12-21 15:46:10 -06:00
ProSavage d19b321438 New deploy & some javadoc fixes 2018-12-20 20:15:10 -06:00
GenialJerome 16aa87a16a Faction Disband Reason & Auto-Completion
- Add Faction Disband Reason
- Add Auto-Completion
- Optimization
2018-12-09 03:13:18 +01:00
ProSavage 7bf5def899 Fixed FactionTop Plugin detection. 2018-12-06 16:06:46 -06:00
Joshua Murphy 364a6d28fa Fixed Typo With Focus 2018-11-22 02:16:58 -05:00
Joshua Murphy a59c226747 Added Focus/Config Fixes 2018-11-22 02:09:58 -05:00
GenialJerome a59e3d9a82 Merge remote-tracking branch 'upstream/1.6.x' into 1.6.x
Merge commit writed after the fork
2018-11-21 02:28:38 +01:00
GenialJerome 5f8ea0bd19 PowerRegenEvent and optimization
- Add power regeneration event
- Change getNone(), a deprecated method, to getWilderness()
- Optimization
2018-11-20 21:01:04 +01:00
Joshua Murphy 139a28de8a Multiple Typos/Fixes From https://github.com/ProSavage/SavageFactions/issues 2018-11-20 07:37:45 -05:00
ProSavage 84f1d354eb Fixed spacing in code around ! operator. 2018-11-07 10:14:42 -06:00
ProSavage 7f1785e152 Fixed disband issue. 2018-11-06 23:38:59 -06:00
ProSavage b1b9bd1b73 Reformatted Code 2018-11-06 23:38:44 -06:00
ProSavage 9d21df9c63 Fixed faction chat mode switch to public, IntelliJ refactor broke it. 2018-11-06 23:01:08 -06:00
ProSavage 32ec804a54 1.7 spectator fix. 2018-10-26 15:10:50 -05:00
ProSavage ffc4812be9 Edited tpBanner to work correctly 2018-10-24 10:48:08 -05:00
ProSavage 9aeb70404d Renamed Main Class of plugin from 'P' to 'SavageFactions', along with the plugin field from 'p' to 'plugin' 2018-10-22 18:43:02 -05:00
ProSavage 80e66d7d6c Changed the enum for Leader to actually be leader and not admin. 2018-10-18 19:39:48 -05:00
ProSavage 713aab8bfa Fixed backward compatibility on 1.12 for particles. 2018-10-18 11:55:21 -05:00
ProSavage f1a42749da Disband exploit fixed 2018-10-01 16:53:10 -05:00
ProSavage 12caa1b9d4 secondary check for disbanding to make sure. 2018-09-30 15:57:16 -05:00
ProSavage a28fe04b8a Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2018-09-30 15:49:41 -05:00
ProSavage 11f7b7511d Fixed disband issue 2018-09-30 15:48:55 -05:00
Driftay fb8837bd7d Added Grabbing Chunk From World to FLocation API 2018-09-26 22:25:47 -04:00
Driftay fd84ae2a18 Added Grabbing Chunk From World to FLocation API 2018-09-26 22:25:33 -04:00
Driftay 1ee8089ca5 Changes Adding 2018-09-21 02:29:28 -04:00
Driftay ed91f58dc9 Added F Paypal 2018-09-21 02:28:20 -04:00
Driftay e580c7eee9 Revamped F Stealth 2018-09-20 16:55:19 -04:00
ProSavage 2adef31cf5 Secondary Check added to fly particles. 2018-09-10 10:05:16 -05:00
ProSavage 4ad062dddb Fixed all issues with F chest, and a massive increase in performance due to /f chest only serializing / deserializing on startup/shutdown instead of realtime. 2018-09-09 12:40:45 -05:00
ProSavage 90ae1822bc Revert "WIP: Access method for commands"
This reverts commit 9c6cc187f2.
2018-09-08 17:28:09 -05:00
ProSavage 9a773702eb Revert "And I did it again"
This reverts commit 9ce8467224.
2018-09-08 17:26:50 -05:00
ProSavage e1a51b9488 Changed parameter name for hasAccess 2018-09-04 18:33:13 -05:00
ProSavage 99a747adcb Revert "Access check updated"
This reverts commit 6eccfa84f1.
2018-09-04 18:13:50 -05:00
Svenja Reissaus ff59fd50cc Updated check for fly permission with minor enhancements 2018-09-03 12:11:57 -03:00
Svenja Reissaus 6eccfa84f1 Access check updated 2018-09-03 12:11:03 -03:00
ProSavage 989c190c8a Merge branch '1.6.x' of https://github.com/ProSavage/SavageFactions into 1.6.x 2018-08-28 21:08:50 -05:00
Svenja Reissaus 9ce8467224 And I did it again 2018-08-28 12:06:26 -03:00
ProSavage 2410fafcc4 Added a cost per use to stealth mode! 2018-08-27 10:39:34 -05:00
ProSavage 1531efc030 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2018-08-26 22:28:15 -05:00
ProSavage 36efd8a24e Added timeout to stealth mode! 2018-08-26 22:27:55 -05:00
Svenja Reissaus 9c6cc187f2 WIP: Access method for commands 2018-08-21 15:02:16 -03:00
ProSavage 94c4ee815a Added support for enabling flight through reload! 2018-08-20 22:55:41 -05:00
ProSavage 8fc9ed7395 Fixed all cross version material issues. 2018-08-13 00:33:40 -05:00
ProSavage 70e069dc05 Banners now work in 1.7-1.13 ( Tested ) 2018-08-11 01:14:18 -05:00
Svenja Reissaus 4c80ade48d Fixed #34 disabled banner alert 2018-08-05 01:52:12 -03:00
ProSavage d0cf88c9c6 Fixed all errors with Sevenja's new commits 2018-08-04 20:32:36 -05:00
Svenja Reissaus 5fe55afc68 Explicit permission checks and more admin bypasses 2018-08-02 14:55:21 -03:00
Svenja Reissaus 85de278dc9 Fixed permission check for /f vault 2018-08-02 13:57:57 -03:00
Svenja Reissaus 40a0d72270 Added /f home permission added to keep players from complaining 2018-08-02 12:33:51 -03:00
Naman 6d397b1cae
Update CmdFly.java 2018-08-02 10:16:55 -05:00
Svenja Reissaus ea861d304d Fixed no confirmation message when inviting offline players 2018-08-02 11:55:47 -03:00
Svenja Reissaus d6d8031804 Only mods and higher should use Mod Chat Channel 2018-08-02 11:54:39 -03:00
Svenja Reissaus 1ac9c123d0 Improved recent Stealth feature to use local variables (performance enchancing) 2018-08-02 11:32:53 -03:00
Svenja Reissaus 6a3b4db565 Added config to allow vanished players to hide particles for moderation purposes 2018-08-02 11:29:41 -03:00
Svenja Reissaus cbb7d478a7 Fixed re invite spam to already invited member and enhanced kick permission check 2018-08-02 11:13:16 -03:00
Driftay 8deb02f29f Merge branch '1.6.x' of https://github.com/ProSavage/SavageFactions into 1.6.x 2018-07-30 12:05:56 -04:00
Driftay 751f46e57e F Stealth Added
Signed-off-by: Driftay <saser_elite@yahoo.com>
2018-07-30 12:05:28 -04:00
ProSavage a7275278e4 Fixed seechunk particles being seen by all players & their locations. 2018-07-29 23:58:07 -05:00
ProSavage bab7a2361d 1.13 see chunk particles are now functional 2018-07-29 23:53:20 -05:00
ProSavage e7e3e14825 1.13 now has working particles. 2018-07-29 14:34:40 -05:00
ProSavage 51f157931f Fixed all compile errors ( Took forever ) 2018-07-28 00:31:58 -05:00
ProSavage 403a086ea7 Super basic /f top which organizes factions by money etc. Just so people dont complain. 2018-07-26 18:40:27 -05:00
ProSavage afc4dbf9b8 /f warunclaimall now actually sends a message on success. 2018-07-26 18:17:24 -05:00
ProSavage cb6f0a8104 Fix claiming check bug caused by Sevenja's Pull Request 2018-07-25 15:09:55 -05:00
ProSavage df9506ca9c /f unclaim fix 2018-07-22 11:33:53 -05:00
ProSavage c5f06f910a /f tnt take inventory space issue fix for new tnt checks 2018-07-20 20:34:33 -05:00
ProSavage e9b080bc9e Made a check for tnt when disbanding. 2018-07-20 20:32:46 -05:00
ProSavage 408725c1d7 Made a Factions.disband() method into the api. 2018-07-20 11:42:47 -05:00
ProSavage 2320fe2586 If player is owner of a claim, all permissions are bypassed The order is OP -> Ownership -> Permission 2018-07-18 09:48:25 -05:00
ProSavage 410e932826 Cancel tpbanner command if banners are disabled. 2018-07-17 10:07:54 -05:00
ProSavage 3543030e64 /f tnt withdraw issue fix. 2018-07-17 09:26:25 -05:00
ProSavage 07d8d95969 Containers can now be accessed by default if undefined & the player is in the same faction as the container being accessed. 2018-07-17 09:03:01 -05:00
ProSavage 143daad9e6 F map autoupdate during flying fixed. 2018-07-12 11:11:07 -05:00
ProSavage 2426142664 Fixed the invite command permission check. 2018-07-11 16:45:55 -05:00
Naman eb288c5cdc /f vault deny perm fix 2018-07-11 08:33:43 -05:00
Naman f70cc119df 1.7 spectator bug fixed.
Placeholderapi is no longer a requirement.
/f showclaims lag fixed
Scoreboard is now off by default, can be turned on in config.
Issue with Flight AutoEnabling when disabled has been fixed.
1.7 itemflag bug fixed
2018-06-21 14:16:55 -05:00
ProSavage e948f56fd2 warbanner item stack could be set higher than 1, fixed. 2018-05-11 18:13:02 -05:00
ProSavage 3ce14d2085 Finished up setbanner command and colored the meta and display name for the serialized banners 2018-05-11 18:11:02 -05:00
ProSavage d95c80ae5b 1.4-STABLE
------------------------------------------------------------------
No Enderpearls in fly fixed - The option was bugged, so if it was true it would do the opposite.
Improved /f map visuals and title!
Title fadeout time, showtime, and fadeintime options added for 1.9+ servers
Fixed Bug in /f upgrades where the slots option for exp would move the spawner instead.
Added Faction chest, an upgradable shared "enderchest" for factions to share!
Added some more entries into /f help in config.
Added Upgrade for faction chest
Banner pattern storage
------------------------------------------------------------------
2018-05-11 17:47:58 -05:00
ProSavage f30cd44b54 1.3-STABLE
------------------------------------------------------------------
1.7 Support Added
- Titles disabled in 1.7
- Banners disabled in 1.7
- Itemflags disabled in 1.7 for /f warp, /f perms, and /f upgrades
/f perms GUI has been redesigned ( Reset your config.yml or Change it from the config differences )

Reset conf.json for the following.
Default color for members set to light green ( &a )
Default color for wilderness set to gray ( &7 )
------------------------------------------------------------------
2018-05-03 09:03:16 -05:00
Naman 6bf4598d57 1.2-STABLE
/f tntfill wont spam chat anymore,
I changed the tntfill_success option, so you're gonna wanna delete that to rengerate it. If you havent edited the lang.yml just delete it and restart
/f stuck wont tp players outside the border anymore.
Nametags & Tab has placeholderapi support added
use {relationcolor} and {faction} for relational color and faction ( These were already built in )
They can be edited in the lang.yml the option is default_prefix.
/f perms now has tntfill, tntbank, and vault permission options
2018-04-24 19:32:26 -05:00
Naman ba9b3587e0 1.1.1-STABLE
/f coords - displays your coords and current world to your faction
/f showclaims - Lists all your claims in every world
/f lowpower - lists players with power under max
/f tntfill <radius> <amount> - fills tnt in a radius and amount, hooks into /f tntbank if you're a mod or higher.

Some of these commands require permissions please see the permissions page here
https://www.prosavage.net/wiki/permissions
2018-04-17 20:06:14 -05:00
Naman aa4bbb3895 1.1.1-STABLE
/f coords - displays your coords and current world to your faction
/f showclaims - Lists all your claims in every world
/f lowpower - lists players with power under max
/f tntfill <radius> <amount> - fills tnt in a radius and amount, hooks into /f tntbank if you're a mod or higher.

Some of these commands require permissions please see the permissions page here
https://www.prosavage.net/wiki/permissions
2018-04-17 20:01:53 -05:00
Naman 6c2ca2a468 1.1-RELEASECANDIDATE-2
Scoreboard bug fixed
inspect message disable fixed
/f seechunk particle options disabled, because they were breaking if invalid.
2018-04-13 22:23:04 -05:00
Naman 175a4a6a12 1.1-RELEASECANDIDATE-2
Scoreboard bug fixed
inspect message disable fixed
2018-04-13 21:31:37 -05:00
Naman e36927db9f 1.1-RELEASECANDIDATE-1
Made the particles in /f fly more cloud like
Changed wilderness color to Darkgreen
Added a factionless check to inspect, so itll now disable the when you try to check with no faction.
Inspect will disable upon entering combat
You cannot claim outside the worldborder anymore, the chunkbuffer is taken into account.
Particles WILL NOT appear in /vanish and in spectator mode
2018-04-13 21:05:43 -05:00
Naman efee66071b 1.0.23
configurable enemy check radius for fly, option added in conf.json
Added a system faction check to neutral
Added a enderpearl disable while flying option to conf.json
Added my own repository to maven along with coreprotect for shading.
--Factions Inspect Added--
2018-04-08 22:13:41 -05:00
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 026b33b427 Don't even load /f fly if its set to false in config. 2018-03-18 14:37:55 -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
Trent Hensler b78ff51e10 Allow console to run /f list 2018-03-11 17:59:11 -07: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 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 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
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
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 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
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 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 d8125eb0d2 Max mapheight is 2x default 2018-02-10 17:03:31 -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 47f0bf1ce5 Tooltips in f map 2018-02-10 15:59:21 -08: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 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 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 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