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

950 Commits

Author SHA1 Message Date
DroppingAnvil f730023b42 Now 1.7 compatible again 2019-10-09 16:53:32 -05:00
DroppingAnvil 2b0bfae44c This update makes the plugin easier to set up (: 2019-10-08 17:48:46 -05:00
Driftay a057a235b8 Fixed a Bunch of Misc stuff & Made config.yml CLEAN 2019-10-01 12:18:44 -04:00
Driftay 07fa138d58 Disabled Discord Features By Default 2019-09-30 16:03:44 -04:00
Driftay a1f527346a Fixed NPE on Guild loading 2019-09-29 18:45:48 -04:00
Driftay 8a4478764f
Merge pull request #19 from DroppingAnvil/1.6.x 
You can now mention discord users in game!
 2019-09-29 18:45:15 -04:00
DroppingAnvil 8b70947d03 Uncommented something that shouldnt have been 2019-09-29 13:36:37 -05:00
DroppingAnvil 58b25c726f First step to mentions! You can now mention discord users ingame if they have a one word name and there is not someone named the same thing! I plan to make this system much much better soon! 2019-09-29 13:29:23 -05:00
Driftay 22ed86b4d8 Added f points to stats discord command 2019-09-29 08:13:48 -04:00
Driftay 2d0d3c96fc Little thing to avoid npe's being thrown in the console 2019-09-29 06:50:45 -04:00
Driftay e5cfc1ebdc Changed f invitebot format 2019-09-29 05:16:13 -04:00
Driftay f63121ed86 Removed token from conf, so owners didnt accidentally use that token 2019-09-29 04:46:21 -04:00
Driftay 3998a346b4 Discord Integration AKA Changing Factions Forever 2019-09-29 04:39:30 -04:00
Driftay 0b1add2a3e Fixed Some things with inventorysee 2019-09-28 03:22:23 -04:00
Driftay 4ab3f3a465 Stopped Referencing ItemStack by mistake 2019-09-28 03:05:03 -04:00
Driftay a493f1494e Code Cleanup 2019-09-24 17:54:12 -04:00
Driftay 2a08f167bb Fixed Citizens error with new upgrades 2019-09-24 17:42:10 -04:00
Driftay f358e6d75b Added Anti-FChest-Items 
(Ability to deny storing items in factions chest)
 2019-09-24 06:39:43 -04:00
Driftay 8338e21dd2 Added F Discord 2019-09-21 13:02:51 -04:00
Driftay d47806b33a Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-09-21 10:35:23 -04:00
Driftay 99edc5b3b5 Missions Not Be Able to Be Done Multiple Times 2019-09-21 10:35:08 -04:00
Driftay a19cfade75
Merge pull request #18 from DroppingAnvil/1.6.x 
Allow F grace from console
 2019-09-20 17:06:41 -04:00
Driftay d6ca2934de Fixed a Few Things 2019-09-20 16:59:31 -04:00
DroppingAnvil 31c3cc538a
Merge pull request #5 from Driftay/1.6.x 
Merge
 2019-09-19 19:25:36 -05:00
DroppingAnvil 917a5feca8 Allow F grace from console 2019-09-19 13:35:07 -05:00
Driftay 81636c6448 Version Change 2019-09-18 08:01:05 -04:00
Driftay 3ce77fe7e1 Fixed Shop Items Sowwy :) 2019-09-18 07:47:03 -04:00
Driftay 8ec16505c4 Fixed Shop Items Sowwy :) 2019-09-18 07:43:18 -04:00
Driftay 0ac6112437 Added Anti-Creeper Glitch To avoid issues with freecam cegging 2019-09-18 05:22:05 -04:00
Driftay 4046ab62e2
Merge pull request #17 from DroppingAnvil/1.6.x 
Fixed grace period issues!
 2019-09-17 19:29:07 -04:00
Driftay b70741b0d5 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-09-17 19:08:47 -04:00
Driftay bd4e6cb6a8 Shop GUI Cleaned up :D 2019-09-17 19:08:23 -04:00
DroppingAnvil a3b819cda3 Fixed grace period issues! 2019-09-17 17:28:32 -05:00
Driftay 0971f72a7a
Merge pull request #16 from DroppingAnvil/1.6.x 
Fixed Faction Upgrades compatibility with 1.14
 2019-09-16 16:23:36 -04:00
DroppingAnvil b29dd64581 Removed my old conversion code for 1.14 since transitioned to XMaterial. XMaterial support added for EXP upgrade 2019-09-16 13:45:41 -05:00
DroppingAnvil bc00a5ebd7 Changed Faction Upgrades GUI to XMaterial 2019-09-16 13:37:25 -05:00
DroppingAnvil 89413057cc Fixed some default Faction Upgrades materials not being compatible with 1.14 2019-09-16 12:51:58 -05:00
Driftay c0a9eeca87 PlaceHolders and better configurability 2019-09-16 07:56:11 -04:00
Driftay 17378f7c3a
Merge pull request #15 from DroppingAnvil/1.6.x 
Added 2 new Faction Mission types!
 2019-09-16 07:37:45 -04:00
Driftay 41fb4dd7ad Added Spawner Lock Command, And Formatted Grace Differently 2019-09-16 07:36:42 -04:00
DroppingAnvil 4181ff539d Cleaned up unused imports 2019-09-15 23:03:58 -05:00
DroppingAnvil b3eca15839 Added 2 new Faction Mission types! 2019-09-15 23:01:34 -05:00
Driftay b0ca56fc71 Spelling POG 2019-09-15 18:48:47 -04:00
Driftay 338b062de0
Merge pull request #14 from DroppingAnvil/1.6.x 
New F Upgrade!
 2019-09-15 18:16:51 -04:00
DroppingAnvil 1e7bd8ff35 Removed 2 lines used for debug. 2019-09-15 17:10:15 -05:00
DroppingAnvil 26010c6ba2 Added a new F Upgrade type! 2019-09-15 17:08:36 -05:00
AigleDev fb3204ddb1 fix an NPE and other changes 2019-09-15 20:53:27 +02:00
Driftay 4f38bfa949 forgot i already added 1 to the level 2019-09-15 07:53:20 -04:00
Driftay 488eb78405 Forgot To Register Upgrade Listener xD 2019-09-15 07:52:29 -04:00
Driftay 82d2971b65 Added Warp, DamageIncrease & Reduction, and TNT F Upgrades 2019-09-15 07:51:12 -04:00
Driftay 7f988031ca Showing Dropping Anvil Something (Ignore) 2019-09-15 05:19:06 -04:00
Driftay 2feaed0aad Showing Dropping Anvil Something (Ignore) 2019-09-15 05:15:33 -04:00
Driftay e7db7170d1 Showing Dropping Anvil Something (Ignore) 2019-09-15 05:14:14 -04:00
Driftay 2a1a8db554 Showing Dropping Anvil Something (Ignore) 2019-09-15 05:12:52 -04:00
Driftay e07dc303ef Showing Dropping Anvil Something (Ignore) 2019-09-15 05:08:00 -04:00
Driftay 978bcbbb3b Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 
# Conflicts:
#	src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
#	src/main/java/com/massivecraft/factions/missions/MissionHandler.java
 2019-09-15 05:04:22 -04:00
Driftay d98f5d9723 Showing Dropping Anvil Something (Ignore) 2019-09-15 05:02:53 -04:00
DroppingAnvil b1525601a0 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-09-15 03:46:59 -05:00
DroppingAnvil 0d5e5dda73 Added tame mission type added "ALL" for all Missions that require Material or EntityType 2019-09-15 03:46:41 -05:00
DroppingAnvil b4b226e4f0
Merge pull request #3 from Driftay/1.6.x 
Update from base
 2019-09-15 03:32:36 -05:00
Driftay c4e81286b7 Deny Breaking Banners to avoid dupe glitches in enemy territory 2019-09-15 04:26:16 -04:00
DroppingAnvil fcab9790b5
Merge! 
Finally back on course and able to merge automatically with Driftay's SaberFactions!
 2019-09-15 03:25:14 -05:00
DroppingAnvil 6f5ba4c11b Getting back on course... 2019-09-15 03:23:10 -05:00
DroppingAnvil 8e238e2b48 Merging branches 1 new mission type 2019-09-15 03:14:15 -05:00
Driftay ed0e17e2a0 Missions Fix 2019-09-15 03:48:25 -04:00
Driftay 58efba39b0 Config Converter Added (DroppingAnvil) 2019-09-14 16:04:20 -04:00
Driftay 804160429d Fixed Fly Disable For People In Creative 2019-09-14 15:51:30 -04:00
Driftay 3c9b606bb9 Introduced Brigadier Command System. More Formatting Coming in next commit. 2019-09-14 15:14:28 -04:00
DroppingAnvil c23d19435d Added check for gamemode when disabling flight as to not disable flight for players not using factions flight but minecraft flight 2019-09-14 10:22:58 -05:00
BuildTools 2439e5258f Fixed WarBanner Persistence Error with Placement 2019-09-14 09:22:38 -05:00
BuildTools baeb797c0d Updated configuration converted for new SaberFactions config. 2019-09-12 18:57:09 -05:00
DroppingAnvil 679fbbf92f Fixed missing import for ConvertConfigHandler added convert perm to Admin kit 2019-09-12 17:28:15 -05:00
BuildTools a58b28536b Changed role names added capitalization and a grammar fix. 2019-09-12 17:14:10 -05:00
BuildTools 8ede39413c Added configuration conversion! 2019-09-12 15:53:52 -05:00
AigleDev 0d8526372e change 2019-09-12 21:21:23 +02:00
AigleDev ba86f28994 NPE fix 2019-09-12 21:20:20 +02:00
Driftay 9b68687ef7 Code Reformat 2019-09-11 06:58:46 -04:00
Driftay 0b4c91af4a Added Upgrade DummyItem Properly, Made config look NOICE & Removed useless thingzz 2019-09-11 06:52:08 -04:00
Driftay 2586908ce3 Factions Player Listener (Access Item Def) 2019-09-09 20:47:53 -04:00
Driftay e5a9b82bdf Fixed NPE (Cleanup Task) 2019-09-08 17:30:04 -04:00
Driftay 8c2f07dcf2 OCD Properly Managed 2019-09-08 01:28:49 -04:00
Driftay ed5394565d New Check System Implemented! 
Massive Overhaul
 2019-09-08 01:25:19 -04:00
Driftay f303a4b497 Fixed NPE With Essentials for CMI users 2019-09-07 10:40:03 -04:00
Driftay e1158ac370 Added faction points papi placeholder 2019-09-07 10:36:18 -04:00
Driftay 8d848523c5 Added Breeding to Missions Handler 2019-09-04 08:13:48 -04:00
Driftay 88f3cbb97c Made Shop Load on F Reload 2019-09-03 07:16:51 -04:00
Driftay 53a79ade27 Piston Fix 2019-09-01 09:29:25 -04:00
Driftay b440f53054 Fixed Fly issue 2019-08-29 19:15:56 -04:00
Driftay aeb0ba4c94
Merge pull request #5 from MTM123/1.6.x 
Implement event for role changes
 2019-08-29 08:06:20 -04:00
Driftay c2ddcb34ce Fixed Object Cast in TntFill 2019-08-29 08:05:02 -04:00
MTM123 8c656eea6e Implement event for role changes 2019-08-29 15:04:51 +03:00
Driftay b30711ebcf ready to merge 2019-08-29 07:59:27 -04:00
Driftay 87ede00cc3 FPlayerRoleChangeEvent Added 2019-08-29 07:53:34 -04:00
Driftay e9c886f997 Formatted Homes on Leave boolean to false 2019-08-27 06:10:17 -04:00
Driftay 38247b17c2 Multiple Enhancements Brought Up To Me By Frasty 2019-08-26 07:31:02 -04:00
Driftay c93d2f235a Fixed F Perms Lore String in Config 2019-08-26 07:21:33 -04:00
Driftay 6a7258b692 One Final Reformat 2019-08-24 13:21:39 -04:00
Driftay 72f76aeb71 Check System Added and Massive Reformat 2019-08-24 13:18:50 -04:00
Driftay 84f4e0f732 Essentials Home Removal on Player Leave 2019-08-24 12:23:04 -04:00
Driftay a10864015c F Upgrades GUI Rows Correctly Configurable now 2019-08-22 17:21:33 -04:00