Commit Graph

965 Commits

Author SHA1 Message Date
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
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
Driftay
11a805747c Fixed F InventorySee bug 2019-08-03 03:15:35 -04:00
Driftay
f2892fdef3 Main Class Renamed and Instance Method 2019-08-02 17:01:33 -04:00
Driftay
477041e223 Default FPerms Fixed 2019-08-01 06:53:46 -04:00
Driftay
31c50473f0 Fixed F InventorySee Bug 2019-07-31 15:17:55 -04:00
Driftay
4e53565887 [+] Added F Notifications - Disable seeing claim notifications in chat
[+] Cleaned up MemoryFPlayer
[+] Setting up for wall checking commands !
2019-07-30 02:34:56 -04:00
Driftay
fab2a3bba0 F Notification, allows to not see claim notifications in chat 2019-07-30 00:31:26 -04:00
Driftay
93b5ba2db5 F Logout Added & Few Cleanups and Workaround to Fixing Default Perms 2019-07-28 05:04:39 -04:00
Driftay
8f72979fdf Forgot Some Code 2019-07-27 23:43:20 -04:00
Driftay
2c1f74a2cf Removed Shop (In Dev) 2019-07-27 23:38:24 -04:00
Driftay
11fb6dcd7d F TNT Take Fix 2019-07-27 22:49:45 -04:00
prosavage
4a794fe706 Faction home fix 2019-07-20 12:12:51 -05:00
prosavage
e121d49762 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-07-20 11:20:22 -05:00
prosavage
4cc9a8a3e9 Faction home fix 2019-07-20 11:20:17 -05:00
Driftay
5b338a25d6 Home Perm Fixed ! 2019-07-19 18:55:11 -04:00
Driftay
1d2371acab Merge remote-tracking branch 'origin/1.6.x' into 1.6.x
# Conflicts:
#	src/main/java/com/massivecraft/factions/zcore/fperms/DefaultPermissions.java
2019-07-19 18:54:38 -04:00
Driftay
56b200fb9b Home Perm Fixed ! 2019-07-19 18:53:42 -04:00
Savag3life
ce8e5853a4 Default Perm for /f home fixed 2019-07-19 00:27:28 -05:00
ProSavage
a495f71278 Fix FUpgradesGUI Spam on 1.14+ 2019-07-18 15:22:03 -05:00
ProSavage
463d5b9a69 Inventoryview spam fixed on 1.14+. 2019-07-18 14:59:24 -05:00
ProSavage
3f20d67fd7 1.14 obsidian exploit patch. 2019-07-18 14:53:25 -05:00
Driftay
7233e8e819 Updates.. XMaterial added 2019-07-17 11:08:55 -04:00
Driftay
16cbee7050 Home Permissable Action Fixed
Usage: /f home <faction>
2019-07-17 10:31:36 -04:00
Driftay
126dfe49a1 Added Command Argument for F Home command to allow staff in F bypass to go to other faction homes!
Usage: /f home <faction>
2019-07-11 03:15:02 -04:00
Driftay
5f2cc89e2d Added AltsList properly and setup booster and point shop
[+] Pom completely fixed
2019-07-11 01:08:35 -04:00
Driftay
dbf7fbe573 Points enabled by default 2019-07-07 23:52:58 -04:00
Driftay
12488b198c Added a few things 2019-07-06 18:20:27 -04:00
Driftay
c9ee5ec975 Forgot to remove statistics perm 2019-07-04 01:15:17 -04:00
Driftay
27a442681d Reformatted - F Paypal + Few Fixes w/F Alts 2019-07-04 01:12:39 -04:00
Driftay
9d40fec03b Code Enhancements... 2019-07-03 23:24:32 -04:00
Driftay
2937e05fda Fixed SavageFTOP Integration Setup 2019-07-03 22:30:58 -04:00
Driftay
87179d262a Class Cleanup for easier navigation 2019-07-01 21:26:13 -04:00
Driftay
6292b9dd0a Cleaned Up Command System To Navigate Easier 2019-07-01 14:23:55 -04:00
Driftay
b9bb6009b9 Points Debugged and Complete! 2019-07-01 14:11:23 -04:00
Driftay
2c6de3c72c TL Fix to register persistence of right command 2019-07-01 14:05:09 -04:00
Driftay
e7bfac7bfd Fixed Point Alias, and Fixed Faction Object Being Registered in TL calling the JsonFaction 2019-07-01 14:00:29 -04:00
Driftay
61f13c92d1 Point System Added 2019-07-01 00:30:23 -04:00
Driftay
59410de5ab Fixed Error 2019-06-30 23:33:38 -04:00
Driftay
3b523062e8 Commits 2019-06-30 23:22:28 -04:00
Driftay
6cfc36b50a Small fix 2019-06-30 05:22:55 -04:00
Driftay
1a90bcbb75 Default Perms Conf Boolean 2019-06-30 05:19:23 -04:00
Driftay
477d6ae44a Updated TL 2019-06-30 04:50:42 -04:00
Driftay
5c2b220880 1.4 Beta Initiated
- Fixed F Inspect
- Added F Global - Toggle Global Chat
- Added F ViewChest - View a Factions Chest
- Updated Perms in plugin.yml
2019-06-30 02:20:17 -04:00
Trent
e2fa19e692 Fix F inspect 2019-06-29 23:08:01 -05:00
BuildTools
28f32ec616 Added F Global 2019-06-29 16:07:48 -05:00
BuildTools
391ce50581 Added alias for Grace 2019-06-29 15:40:09 -05:00
Driftay
4c3b8b0d18 Added F InventorySee 2019-06-29 10:20:59 -04:00
Driftay
be9bdaa4fd Fixed Warning About KICKALT and INVITEALT Permissable Action 2019-06-29 09:12:25 -04:00
Driftay
9094cb4f70 Added "faction chunk at %player%" Skript Expression 2019-06-29 07:00:23 -04:00
Driftay
72799966c7 Updated Code I forgot to commit 2019-06-29 03:36:31 -04:00
Driftay
2c5a501d0e Saber Factions Initiated 2019-06-28 21:49:46 -04:00
Driftay
1fd3220e5e Initial Commit 2019-06-28 16:46:45 -04:00
Driftay
8b08c4f72a Fix vanish integration in fly 2019-06-06 15:32:46 -04:00
Driftay
7dd071340f Added Corner Command, Spam Prevent System, Members Upgrade Redone 2019-06-03 18:34:10 -04:00
Driftay
f8195caf06 Fixed MustBe TL Error & Added Member F Upgrade 2019-06-02 23:13:10 -04:00
Driftay
420d8e3321 Cooldown and F Spam System Implemented 2019-06-02 14:28:42 -04:00
Driftay
4833cafa0e Code Overhaul and Added ALOT 2019-06-02 01:52:34 -04:00
Driftay
1f680b56f0 Upgrades Check & Check for Alts usage in faction 2019-05-24 19:36:03 -04:00
Driftay
d65233d9e0 Changes for upgrades - ProSavage 2019-05-24 19:30:37 -04:00
Driftay
e50612d0f2 Fly Fixes 2019-05-24 19:12:21 -04:00
Driftay
e3cfb575fd Fly Fixes 2019-05-23 17:08:18 -04:00
Driftay
791f59cc6c 1.1-Beta Version Change 2019-05-23 09:30:10 -04:00
Driftay
20d6c9d18c 1.1-Beta
Fly NPE Fixed
2019-05-22 22:52:30 -04:00
Driftay
edc62a8493 Completely Reformatted Alts System for Better Performance and Command Help 2019-05-22 20:12:46 -04:00
Driftay
c5445e2d17 Fixed NPE with Start flight method 2019-05-20 15:25:23 -04:00
Driftay
2cb2068825 Remove double negatives in toggleFly() 2019-05-20 13:27:45 -04:00
Driftay
3c5d8ee050 Fixed Alts NullPointer
Setup base for Members Upgrade
2019-05-19 19:01:59 -04:00
Driftay
06e7eaf572 Initial Release Commit
Standard Feature Placement.
2019-05-19 16:09:00 -04:00
Driftay
23b92e1246 Added alot 2019-05-15 03:10:10 -04:00
Driftay
26a9e4eba8 Added alot 2019-05-14 22:07:59 -04:00