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

1221 Commits

Author SHA1 Message Date
Driftay
1a4c860c46 Fixed F Power Upgrade 2020-01-26 16:08:03 -05:00
Driftay
ad56264c5d 1.15 Support for Permissable Items & Fixed F Upgrades GUI Rows 2020-01-26 15:54:54 -05:00
Driftay
def1a8b15a Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2020-01-26 12:51:58 -05:00
Driftay
8b577d360b Added Barrels to Container Permissible Action & Fixed NPE When running f seechunk on 1.15.1 2020-01-26 12:51:41 -05:00
DroppingAnvil
f34ebc73fa Remove unused import. 2020-01-26 00:48:21 -06:00
DroppingAnvil
c86db7ab51 Fix system factions with custom names fly permissions. 2020-01-26 00:48:21 -06:00
Driftay
018f08699d 1.15 Item Conversion Complete 2020-01-20 03:46:53 -05:00
Driftay
ce1eedd7cd Home Fix & Version Change 2020-01-19 03:40:30 -05:00
Driftay
417cc57aa7 Confirmation Disband GUI Created 2020-01-19 02:55:56 -05:00
DroppingAnvil
57ac2c8c98 Fix getAccess for leaders 2020-01-18 21:26:21 -06:00
Driftay
25515d863e Fixed F Show & Made SaberFacs not Require Essentials 2020-01-18 02:33:01 -05:00
Driftay
2412931122 Reformat again 2020-01-18 02:20:11 -05:00
Driftay
51838df0d7 TntFill Fixed & Code Cleanup 2020-01-18 02:18:38 -05:00
Driftay
e3e6f5561c Discord Placeholders 2020-01-17 21:50:34 -05:00
Driftay
a54a7aa4fb Added Placeholders to papi 2020-01-17 21:45:18 -05:00
Driftay
9de773ddae Announcement Placeholder 2020-01-17 21:42:23 -05:00
Driftay
9a32cd9501 Adding some placeholders 2020-01-17 21:36:36 -05:00
DroppingAnvil
6544513ca7 Many F Fly bug fixes: 
- Async get nearby entities
- Not respecting admin bypass
- Not respecting permissions for system claims
- Not respecting permissions for relations
- Sending fly disabled message when user is not flying
- Sending double messages when disabling
- Sometimes disabling fly while in creative and spectator game modes
 2020-01-17 17:55:37 -06:00
DroppingAnvil
f7619f0685 Fixed a few issues with CmdAdmin now being Async 2020-01-15 16:01:32 -06:00
droppinganvil
a20c2ec2eb Tiny bug fix. 2020-01-15 15:21:02 -06:00
DroppingAnvil
028734a42c Shutdown JDA on disable. 2020-01-14 12:57:09 -06:00
DroppingAnvil
29b9eadd57 Fix mistype made in Aliases. 2020-01-10 20:41:12 -06:00
Driftay
c274918244 Removed everything shield wise for release with bug fixes 2020-01-07 15:37:46 -05:00
Driftay
57833bee13 Fixed TntFill (Again) -_- 2020-01-04 18:49:55 -05:00
Driftay
0a1346f1c2 Made Scoreboard Dummy Proof & Started Adding Shield Tasks Timers and Objects 2020-01-04 18:29:49 -05:00
Driftay
5145ae1714 Allowed players to continue using Essentials fly is Factions Fly is Disabled 2020-01-04 13:23:55 -05:00
Driftay
086ec3e145 Allowed Custom Heads to be in Faction Upgrades 2020-01-04 12:42:53 -05:00
Driftay
d538502457 Added Enchanting on Level 1 or Higher for Upgrades 2020-01-04 12:26:23 -05:00
Driftay
978782e2fe Remade Faction GUI 2020-01-04 12:23:10 -05:00
Driftay
ce1004d318 Removed Stream Code lol 2020-01-04 11:29:44 -05:00
Driftay
ad69019ba6 Fixed F Chest Logging 2020-01-03 18:53:01 -05:00
Driftay
b8f6a05538 Re-added Mis-deleted code 2020-01-03 10:55:22 -05:00
Driftay
98b40d325a Fixed Chest Error, and Fixed Unban TL Translation 2020-01-03 05:04:12 -05:00
Driftay
8f2e58733d Decided to remove alot of open and closing brackets for no reason lol 2020-01-02 10:35:54 -05:00
Driftay
ae17f3d788 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2020-01-02 05:02:56 -05:00
DroppingAnvil
a71bbd5b14 remove unused import. 2020-01-01 20:04:02 -06:00
DroppingAnvil
05e1a7297c Change any command (: also refixed tntfill 2020-01-01 19:59:31 -06:00
Driftay
1f9965b13a Fixed NPE Throwing From Console Disband 2020-01-01 02:34:59 -05:00
Driftay
fb32d2155b Fixed Error being thrown with FRenameEvent 2020-01-01 02:11:20 -05:00
Driftay
4c90bae87c F Reserve System ReAdded 2019-12-31 02:56:45 -05:00
Driftay
05cfd5d8b0 Added AutoUpdating FMap on Click to Claim 2019-12-31 02:20:33 -05:00
Driftay
b2fdcd5649 Fixed Click To Claim FLog 2019-12-31 01:45:33 -05:00
Driftay
f4bfa83e24 Added FLog For Click to Claim Map 2019-12-31 01:42:22 -05:00
Driftay
4222dd9689 Added FLog For Claiming Single Chunk 2019-12-31 01:40:04 -05:00
Driftay
f7297c96c4 Flog Material & Slot Fixed 2019-12-31 00:20:00 -05:00
Driftay
87f0810914 Fixed WorldEdit Player Cast 2019-12-31 00:03:57 -05:00
Driftay
016c82fa85 FAudit Slots & Materials Configurable 
Fixed IllegalPluginAccessException onDisable
 2019-12-30 23:56:59 -05:00
Driftay
fad866cf33 Fixed Bow Boosting 2019-12-29 17:30:12 -05:00
Driftay
ca5d7663f9 Added Default Size for F Chest 2019-12-29 17:26:29 -05:00
Driftay
e0134d680e Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-12-28 04:58:52 -05:00
Driftay
8e855bc9bb More Audit Things + Code Cleanup + SaberException Added for Debugging 2019-12-28 04:58:33 -05:00
DroppingAnvil
2772d85603 Added check for Discord system during setup. 2019-12-26 15:25:47 -06:00
Driftay
acf06c78ed Removed Discord statTrace in Login Exception 2019-12-26 14:54:24 -05:00
Driftay
cda1610a58 Added Brand New F Audit Base. 2019-12-24 22:19:49 -05:00
Driftay
372eed65a0 Fixed OCD 2019-12-24 09:27:36 -05:00
Driftay
86f92a7fb0 [+] 1.15 Support Added! 
[+] Greatly optmized ALOT of Commands!
[+] Removed Portal Travel Agent (Recoding)
[+] Added Administrator Command F Lookup
 2019-12-24 09:19:43 -05:00
Driftay
897fdbf83a Added TL Fixture for Drain Description 2019-12-22 18:24:50 -05:00
Driftay
4e11234a08 Added F Drain Command (A Command which allows players with permission to obtain all the money in faction members balances.) 2019-12-22 18:21:17 -05:00
Driftay
3a22bb348e Fixed Spawner Breaking NPE 2019-12-22 01:03:47 -05:00
Driftay
91ca08e66b Fixed Co-Leader Default Permissions 2019-12-21 23:52:14 -05:00
Driftay
38cf542d8c Fixed territoryBypassProtectedMaterials - 2 Maps were defined 2019-12-21 22:03:40 -05:00
DroppingAnvil
93b485aae8 Version change + /f wild permission added to permission kits 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-12-19 17:35:29 -06:00
DroppingAnvil
b9996a2250 Fix /f deinvite 2019-12-19 15:10:55 -08:00
Driftay
368a605d31 Format Code, Fixed 2 NPE's 2019-12-19 14:23:41 -05:00
DroppingAnvil
fec07b6fac Added a wilderness teleport command (/f wild) and fixed a few bugs 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-12-16 18:46:38 -06:00
DroppingAnvil
58e43b41cc CmdReload made more useful by changing how commands that can be disabled are added to the root. You can now get the instance of FCmdRoot, Recheck variable added commands, rebuild brigadierManager, and get the status of each command that can be disabled. CmdDebug now gets the status of variable added commands. 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-12-16 13:32:12 -06:00
DroppingAnvil
d5645f3b0a Revamped in-game Discord mention system. 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-12-15 19:37:12 -06:00
DroppingAnvil
fa10bf7003 Discord feature additions, Discord startup flow changed, /f debug added 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-12-12 04:48:00 -06:00
Driftay
ca9502a4b6 TL References Properly to Generic_Disabled 2019-12-03 05:16:37 -05:00
Driftay
0a60a581f5 Started Base For Custom GUI Handling 2019-12-02 22:31:58 -05:00
DroppingAnvil
f124877dba Fixed message issue with lang when promoting a player in a faction to Admin. 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-12-02 19:52:30 -06:00
Driftay
fc5befd7cc Proper Credit Noted 2019-12-02 20:12:58 -05:00
Driftay
d03ca58105 More Credit 2019-12-02 14:03:27 -05:00
Driftay
f437144fba Giving Credit 2019-12-02 13:55:38 -05:00
Driftay
9284707db6 Fixed ArrayIndexOutOfBounds Exception With Deinvite Command 2019-11-30 00:41:44 -05:00
Driftay
c0719ec4f5 Reverted final persistence 2019-11-29 05:12:07 -05:00
Driftay
c9fd86ef9e Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-11-29 04:59:20 -05:00
Driftay
939a60c611 Bunch of Econ, Lang.yml Additions 2019-11-29 04:58:59 -05:00
DroppingAnvil
36f22262c6 Added the ability to toggle titles when entering claims of a different faction 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-11-28 19:34:39 -06:00
Driftay
f5e9ce3d90 Fly Changes, And Message Persistence 2019-11-28 02:09:21 -05:00
DroppingAnvil
e244b469aa
Update Permission.java 2019-11-25 01:20:07 -06:00
Driftay
5f80ecfa76 Fixed Permissions And Removed Shield Code From Main Branch to Avoid pointless runnables 2019-11-24 22:37:31 -05:00
Driftay
28517ef391 More to Shields & Mission Class Cleanup 2019-11-23 22:33:49 -05:00
Driftay
f3b0dcdb7f Quick Fix With Fly Check Console Spam & Properly Defined Variables In TL for TNT command 2019-11-22 04:55:58 -05:00
Driftay
0b127cbe72 SyncSaving and Persistence with Unclaiming and Disbanding With Fly Checks 2019-11-21 09:38:15 -05:00
Driftay
3710031b80 Fixed World Guard Initiation 2019-11-21 09:10:04 -05:00
Driftay
6c10cdd47d Version Change 2019-11-21 09:04:57 -05:00
Driftay
fe5378e9d7 Massive Code Reformat (Fixed 4 Issues Brought up in Discord) 2019-11-21 08:50:51 -05:00
Driftay
e60d58e68b CoreProtect Persistence of ForEach 2019-11-21 08:07:55 -05:00
DroppingAnvil
649392363f Randomized missions implemented! 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-11-18 17:06:05 -06:00
Driftay
1927f49221 Fixed CmdMoneyBalance ClassCastException 2019-11-17 11:17:08 -05:00
Driftay
9349a914ce Misc Changes 2019-11-16 04:25:34 -05:00
Driftay
f8e22896d5 Fixed NPE with FlyTask 2019-11-16 04:23:43 -05:00
Driftay
ac859db55f TntFill Logic Fixed 2019-11-14 04:23:35 -05:00
Driftay
8c7addb68e F Home and ClaimAt Fix 2019-11-14 03:44:35 -05:00
Driftay
d808bac17b Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 
# Conflicts:
#	src/main/java/com/massivecraft/factions/cmd/CmdHome.java
 2019-11-14 03:43:06 -05:00
Driftay
d3a7fc67a5 F Home and ClaimAt Fix 2019-11-14 03:42:47 -05:00
DroppingAnvil
bd77c8266c Small bug fix + Code added to run randomized missions 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-11-14 02:27:41 -06:00
Driftay
8bde1385fc Few Fixes 2019-11-09 15:20:25 -05:00
Driftay
472cb86465 TNT Dialog Fixed 2019-11-07 13:17:59 -05:00
Driftay
d77ee76ea7 Blacklisted Names & Misc changes to setup for new revamp 2019-11-07 07:09:45 -05:00
DroppingAnvil
441382acdc Fix issues with 1.13+ 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-11-05 18:31:17 -06:00
DroppingAnvil
d3870731f4 Introduced updater for config.yml 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-11-05 17:15:42 -06:00
DroppingAnvil
9b999ffc84 Fix infinite tnt glitch with /f tntfill. Thanks to Atronis for allowing me to debug on their server! 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-11-01 18:38:14 -05:00
DroppingAnvil
9e6c91bec1 All /f fly permissions converted to Permission Enum. Why were they just strings? I didnt even know all these perms were a thing until now bc they were not in the enum. 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-11-01 16:37:38 -05:00
DroppingAnvil
07db3fd015 Only leaders able to set their factions PayPal and Discord. 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-11-01 15:35:32 -05:00
DroppingAnvil
73ba6fb608 Various bug fixes. Thanks to Akraos for helping debug! If you would like to regenerate your conf.json it adds an option to turn off the creeper glitch prevention. 
Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>
 2019-11-01 15:17:24 -05:00
DroppingAnvil
9c62eee5e8 Few tiny improvements. 2019-11-01 13:23:41 -05:00
DroppingAnvil
dd02853934 Much needed additions to events. 2019-11-01 13:15:18 -05:00
DroppingAnvil
d379f22d46 My mistype found + corrected 2019-11-01 04:58:52 -05:00
DroppingAnvil
5556458c93 Better events! Will be making them even better tmr (: 2019-11-01 04:52:59 -05:00
Driftay
bbed3f0bb0 Bunch of Misc Fixes Reported in Discord 2019-10-27 17:24:17 -04:00
DroppingAnvil
77245e716f
Merge from DroppingAnvil/1.6.x 
Fixed issue with 1.7 entity damage event
 2019-10-27 13:35:05 -07:00
DroppingAnvil
63cfe61826 Fixed issue with 1.7 entity damage event 2019-10-27 15:32:52 -05:00
DroppingAnvil
a97e0f2b31
Merge from DroppingAnvil/1.6.x 
Added ability to disable dependency checks
 2019-10-17 13:02:55 -05:00
DroppingAnvil
d57f3b6f01 Moved dependency one line down 2019-10-17 13:01:44 -05:00
DroppingAnvil
77c74e10ac Adds ability to turn off dependency checks in conf.json 2019-10-17 13:00:00 -05:00
Driftay
bdc658922f small fix with placeholder 2019-10-13 11:08:17 -04:00
DroppingAnvil
93744347db Moved code 2 lines up to not bypass the reload time count 2019-10-13 02:52:23 -05:00
DroppingAnvil
b13afcb6a2 Fixed /f corner cannot claim spam, Fixed some issues with no blocks placeable near faction vault with certain circumstances, /f reload now reloads corners, Message for needing more power to claim missing space fixed. 2019-10-13 02:48:53 -05:00
DroppingAnvil
c9eca60c18 Bug and spelling fixes + version change 2019-10-12 15:23:11 -05:00
DroppingAnvil
b46009f633 MissionGUI improvements with a small fix for first run of the plugin 2019-10-12 13:34:36 -05:00
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
DroppingAnvil
0b626397a5 More permission kit fixes 2019-10-07 19:11:55 -05:00
DroppingAnvil
db669ce2c2 More permission kit fixes 2019-10-06 17:30:08 -05:00
DroppingAnvil
4b23117262 More permission kit fixes 2019-10-04 17:54:22 -05:00
DroppingAnvil
7973d807e6
Merge from Driftay/1.6.x 
Merge from Driftay 1.6.x
 2019-10-04 17:38:56 -05:00
DroppingAnvil
666d6ab21d Players unable to use /f perms due to lack of permissions 2019-10-04 17:35:25 -05:00
Driftay
6ba970ac13 2 typos 2019-10-01 12:34:02 -04: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
8f013e13a4 Fixed a small config mistake I had made 2019-09-15 03:50:07 -05: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