Commit Graph

1462 Commits

Author SHA1 Message Date
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
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
e247d01feb Fixed Oof Error 2019-09-09 20:53:42 -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
cd861e730e Accidentally changed the wrong lore to capital, sorry ^.^ 2019-08-28 08:09:27 -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
Driftay
b91d13feea NoFactionPrefix Fixed, Along with Small Enhancements! 2019-08-21 13:52:03 -04:00
Driftay
b0ebe7ec1a Returned Balance Output 2019-08-18 09:53:50 -04:00
Driftay
fdb76f39f5 Begun Adding ChestLogs
//TODO flat file, shift click registry
2019-08-18 09:19:41 -04:00
Driftay
49ec990c2f Fixed NPE With Auto Leave Flight Task 2019-08-18 09:15:30 -04:00
Driftay
f497f96b94 Formatted TnT Commands/Added Alias for Missions
And Few Code Clean Ups From Last Week
2019-08-17 15:02:38 -04:00
Driftay
769394a058 Faction Missions Implemented + Allowed Console to give points now 2019-08-07 14:35:19 -04:00
Driftay
92d46f91f4 Fixed Bug with Points 2019-08-07 12:05:20 -04:00
Driftay
664d27a57c Removed EntityType ZOMBIE_VILLAGER from safezoneNerfedCreatures to fix errors 2019-08-07 10:01:30 -04:00
Driftay
6f50c4e680 Made Giving F Points Player Supported Too 2019-08-06 19:39:20 -04:00
Driftay
ac85687258 Fixed Econ Format, Added Multiple Placeholders, Updated Pom. 2019-08-06 08:01:09 -04:00
Driftay
de76801757 NPE Fixed in Vault & Updated Maven Plugins 2019-08-06 07:20:53 -04:00
Driftay
1dc454e2a5 OCD, had to fix it 2019-08-06 07:15:12 -04:00
Driftay
9293e884e1 Added Zombie Villager to safezoneCreatures 2019-08-05 19:26:41 -04:00
Driftay
8dc1e97098 Implemented SavageFactions Warp and Perms system as requested. - Credits SavageLif3 & ProSavage 2019-08-05 08:05:22 -04:00
Driftay
1b02bd89d4 F-Shop Added (Simplistic Version) 2019-08-04 16:23:40 -04:00
Driftay
bee0bff504 PermissableAction Fixed 2019-08-03 16:52:35 -04:00