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

1596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ProSavage
c4594682fc Added another balance set to 0.... 2019-03-11 00:12:25 -05:00
Driftay
cbf4467f84 Fixed OutPut Error Code By Renaming Run Method 2019-03-09 13:51:06 -05:00
Driftay
8697de9e85 Fixed NullPointer With UtilFight 2019-03-09 13:40:13 -05:00
ProSavage
e4899e4d8d Fix conf startup error. 2019-03-04 17:35:20 -06:00
ProSavage
5a63e71054 Merge branch '1.6.x' of https://github.com/ProSavage/SavageFactions into 1.6.x 
# Conflicts:
#	src/main/java/com/massivecraft/factions/SavageFactions.java
 2019-03-04 15:46:39 -06:00
ProSavage
4b7d0889ea Made a static boolean so plugins hooking in can check if completely enabled. 2019-03-04 15:39:29 -06:00
Liz3
1e555d8b6b
Merge pull request #114 from ProSavage/ident-fixes-correction 
Ident correction.
 2019-03-03 05:14:23 +01:00
Liz3
b10d0caafa Ident correction. 
Last branch had a bad intend due to some misconfiguration on my side.
 2019-03-03 05:10:25 +01:00
Naman
0abada3708
Merge pull request #113 from ProSavage/ident-fixes 
Indent Fixes - Liz
 2019-03-02 21:58:55 -06:00
Liz3
19b556a8c4 added ident message to Contributing.m 2019-03-03 04:52:32 +01:00
Liz3
c6512bf316 Fixed Indents on all files using the reformat option and optimized imports 2019-03-03 04:51:21 +01:00
SvenjaReißaus
bb7d32bb92
Configurable Tntfill enable/disable 2019-02-26 13:01:27 -05:00
SvenjaReißaus
39334070a7
WIP: DCustom Default Faction Permissions - No reliable 2019-02-26 12:15:17 -05:00
ProSavage
52c1966fb8 Use different vault repo for rapid compiling. 2019-02-25 13:39:27 -06:00
ProSavage
62639722e8 1.6-RC 2019-02-19 21:03:44 -05:00
ProSavage
cfd1879466 Merge branch '1.6.x' of https://github.com/ProSavage/SavageFactions into 1.6.x 2019-02-19 21:00:27 -05:00
ProSavage
a01e4d03a8 1.6 STABLE 2019-02-19 20:59:25 -05:00
Naman
4915e68139
Merge pull request #104 from Drc-DEV/patch-3 
Fix misleading comment on title time
 2019-02-19 21:17:07 -04:00
Drc-DEV
efd98deed6
Fix misleading comment on title time 
Title fadein, show and fadeout times are in ticks, but the config says it's in seconds.
 2019-02-19 08:36:54 +01:00
Naman
8b90488e4c
Merge pull request #102 from Drc-DEV/patch-2 
Fixes NPC, BONE_MEAL and Essentials related exceptions
 2019-02-18 12:02:55 -04:00
Drc-DEV
96fe8d059e
Fix HomeCheck (no essentials) + BONE_MEAL Material 
Bypass the PlayerHomeCheck if Essentials is not installed (causes exceptions)
Fix BONE_MEAL multi-version support
 2019-02-18 15:21:17 +01:00
Drc-DEV
16081752ad
Do not check for NPC Teleportation 
Fixes this error: https://pastebin.com/GC2tVctc
 2019-02-18 05:56:56 +01:00
Naman
23df43cce3
Merge pull request #101 from Drc-DEV/patch-1 
Fix NoSuchFieldError (GRASS_BLOCK) on <1.13
 2019-02-17 16:33:24 -04:00
Naman
83b6b0c3b7
Merge pull request #100 from FlowZz99/1.6.x 
Fix Max-Relation bug

Thanks for the help, Ive been sick so I havent had time to work on this stuff!
 2019-02-17 16:33:09 -04:00
David
e0c3ce1094 Fix No Such Field Error 2019-02-17 21:28:07 +01:00
Drc-DEV
b7acf7e62e
Update FRelationCommand.java 2019-02-17 19:16:21 +01:00
Drc-DEV
3b7cdbdae3
Fix NoSuchFieldError (GRASS_BLOCK) on <1.13 
https://pastebin.com/GeskSHNh
To fix this issue: https://github.com/ProSavage/SavageFactions/issues/97
 2019-02-17 18:24:46 +01:00
David
86bc78d082 Fix Max-Relation bug 2019-02-17 11:29:29 +01:00
ProSavage
707b7796c6 Quick rounding implementation added into /f top. 2019-02-12 07:54:58 -04:00
ProSavage
25ac8f026e More sorting cleanup & lambda functions in F Top Command. 2019-02-12 07:51:59 -04:00
ProSavage
c2a90e857f Converted more Collection sorts to internal sorting methods. 2019-02-12 07:50:40 -04:00
ProSavage
8ee1b1da52 Removed duplicate condition check in Ftop Command. 2019-02-12 07:48:51 -04:00
ProSavage
69c698f6f2 Changed sorting from collections sort, into the internal call. 2019-02-12 07:48:18 -04:00
Driftay
5a37320397 Code Cleanup/Added Configurable option to deny and remove homes in ANY factions land. 
More Soon..
 2019-02-10 23:57:45 -05:00
Driftay
3559a9f090 Added Configurable Option to Broadcast Disband and Create Messages For Factions 
**More Coming Soon**
 2019-02-09 13:33:02 -05:00
Naman
ce98d68518
Merge pull request #86 from GenialJerome/1.6.x 
Protection, Placeholder and fix
 2019-02-09 02:50:06 -06:00
Naman
d89c35b1bb
Merge pull request #82 from James-Frowen/1.6.x 
Allowing warps to be replaced at max warps
 2019-01-30 03:28:02 +00:00
GenialJerome
69207ac898 Protection, Placeholder and fix 
Add :
- PlaceHolder %faction_name_at_location%
- Add protection with farm land
- Add protection to shulkers, to beacon, cauldron and brewing stand
- Add protection with bone meal
- Convert permission for the command

Fix :
- Console /f list
- Console /f show
- Claim with Wilderness is unclaim the land
- Dynmap players.admins and players.admins.count is for co-leader. The leader already have players.leader and a faction have one leader only

Optimization
 2019-01-27 03:41:25 +01:00
ProSavage
7b55a80744 Italian Language Globalization :D 2019-01-18 19:06:50 -06:00
ProSavage
e1a1c630ad Fixed the elusive interact bug 2019-01-18 18:38:46 -06:00
JamesFrowen-PC\JamesFrowen
ae61303a9b allowing warps to be replaced at max warps 2019-01-18 16:08:51 +00:00
ProSavage
a47e06a34e Added factions.showclaims to the plugin.yml. 2019-01-13 10:36:36 -06:00
ProSavage
f0c438270c I seem to have committed the wrong file. 2019-01-13 10:36:15 -06:00
ProSavage
5ca6b7d2d4 Fixed warzone tab autocomplete issue. 2019-01-13 10:23:02 -06:00
ProSavage
18e53d2a91 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-01-06 21:04:46 -06:00
ProSavage
7ecc09f64d Fixed /f reload issue, with /f perms 2019-01-06 21:04:38 -06:00
Naman
f6c9bb0419
Update README.md 2019-01-03 21:28:24 -06:00
ProSavage
909c2b9a9f Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-01-02 23:12:09 -06:00
ProSavage
d6a0be7ac2 Conf is now editable without having to stop server. 2019-01-02 23:12:02 -06:00
Driftay
c45ee751f5 Fixed F Chest Name Bug 2018-12-29 13:43:54 -05:00