AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-30 10:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,995 Commits 38 Branches 58 Tags 8.9 MiB
dcaf1ec11a
Commit Graph

840 Commits

Author SHA1 Message Date
Paldiu
2a87271642 Should fix FS-143 2021-03-19 08:58:29 -05:00
Ryan
ff2bca26aa
Merge branch 'development' into FS-33 2021-03-18 19:58:10 +00:00
Nathan Curran
eb05b05042
Fixed FS-93 
- Players no longer need to relog, just need to be opped to get permissions.
- Removed redundant PlayerJoinEvent code as it's already been executed (See RankManager class).
 2021-03-16 20:21:31 +11:00
Nathan Curran
b9c1970d20
Update player's permission when opping. 2021-03-16 19:56:29 +11:00
Nathan Curran
9eca9ac5b2
Remove double storage 
It is unnecessary as the information is already stored in a map (Username, IPs)
 2021-03-08 11:34:48 +11:00
Nathan Curran
5b577fae07
Add myself to developer list 2021-03-07 20:46:30 +11:00
Nathan Curran
452a8755c2
Properly fix FS-33 2021-03-07 20:43:25 +11:00
Ryan
f0a25fde0c
Merge branch 'development' into abhi-test 2021-03-06 20:03:19 +00:00
Paldiu
0dd5a26efa Merge branch 'frontdoor-and-banExpiry-only' of https://github.com/AtlasMediaGroup/TotalFreedomMod into frontdoor-and-banExpiry-only 2021-03-06 12:12:59 -06:00
Paldiu
5c097c83cb Here's to hoping this fixes that stupid ban crap. 2021-03-06 12:00:32 -06:00
abhiram
342df43f85 Added myself to TFM 2021-03-06 13:04:36 +05:30
Paldiu
9161016f73
Merge branch 'development' into frontdoor-and-banExpiry-only 2021-03-03 11:52:37 -06:00
Paldiu
bdd22f8d75
Update month to be 30 days instead of 4 weeks 2021-03-03 12:50:45 -05:00
abhiram
85c35f25a3 [+] Fix codacy issue 2021-03-03 06:47:22 +05:30
Paldiu
46273b3301 Revert "SQL PreparedStatement Fixes" 
This reverts commit 17347c23a5.
 2021-03-01 23:03:13 -06:00
abhiram
d6b74a76bb [+] Fix of FS-33 2021-02-28 21:28:20 +05:30
abhiram
6f66957b17 Few fixes for JIRA issues.... 2021-02-28 21:08:39 +05:30
Paldiu
17347c23a5 SQL PreparedStatement Fixes 2021-02-26 15:29:02 -06:00
Paldiu
718748f1a2 Commit Ultimate 
ultimate super mega mode power upgrade
 2021-02-26 15:26:13 -06:00
Ivan
96424694ee fix codacy errors 2021-02-25 17:03:31 -05:00
Ivan
0367d9fd3a my end of the bargain 2021-02-25 16:42:30 -05:00
Elmon11
ec51cb7408
removing BukkitTelnet from untouchable plugins 2021-02-17 22:03:35 +01:00
Ryan Wild
5d312a12d4
Remove the duplicates that I can see based off of the recent warn 
Heap is entirely removed as it doesn't appear to now be a valid command. The rest are duplicated elsewhere. When in doubt the highest level of restriction was applied.
 2021-02-14 18:05:32 +00:00
Ryan Wild
b88cdf1250
Re-Base Config against Freedom-01 
Ensures all the variables we probably have changed and that run as standard are set, commands that are blocked are updated and anything else I could think of are up to date.
 2021-02-14 17:44:57 +00:00
Ivan
b8a741aa58
Add new developers to util 
Hopefully this doesn't fuck up this time - last PR my Macbook was having issues with for some reason.
 2021-01-25 20:36:58 -05:00
speed
8225daf6f1 permission changes & remove massmurder 
resolves FS-69, FS-70, FS-71
 2021-01-10 16:23:20 -05:00
Paldiu
830daab8f4 Fix Daemon Error 
Reflection issue when initializing the daemon; trying to call a constructor with one argument using two arguments.

Removed an unused constructor.
 2021-01-08 17:32:54 -06:00
speed
9688827a39 formatting 2021-01-08 10:10:54 -05:00
Paldiu
3464a33678 NPE on Thread.join() possible fix 
This bug is hard to decipher mainly due to the thread being terminated somewhere before the thread.join is called. this may be due to the safeClose method defined with serverSocket, but again, I'm not too sure what's up here. This may also be because something failed to execute in one of the try catch statements, causing the thread to never be initialized in the first place.
 2021-01-08 00:25:46 -06:00
Paldiu
fbf2972006 Merge branch 'sql-fix' into paldiu-local 2021-01-07 13:40:59 -06:00
Paldiu
aa2836b29a Merge branch 'mbw-fix' into paldiu-local 2021-01-07 13:39:51 -06:00
Paldiu
260368585e reformat 2021-01-07 13:29:47 -06:00
Paldiu
323fd1a031 Should be fine now 2021-01-04 18:27:57 -06:00
Paldiu
c7b0f77910 Merge branch 'development' into paldiu-local 2021-01-04 13:14:53 -06:00
Elmon11
e32c2eed15
Update FUtil.java 2021-01-03 19:23:10 +01:00
Elmon11
7afa80c89f
Update FUtil.java 2021-01-03 19:18:14 +01:00
Elmon11
a3cccc7ac0
Update FUtil.java 2021-01-03 19:16:41 +01:00
Elmon11
bc37ed5341
Fix developer title not showing up on Offline mode servers 2021-01-03 19:04:23 +01:00
speed
0a5ce5b9cc fix w/e in mbw 2020-12-31 13:06:05 -05:00
Paldiu
a4e23dc03f Codacy Complacency Part 2 2020-12-29 22:14:57 -06:00
Paldiu
7a394e52e4 Codacy complacency 2020-12-29 22:06:12 -06:00
Paldiu
9352a48650 Finalized lombok removal 
Finally removed all lomboks, also reduced npath complexity for FreedomCommand.FCommand#execute and removed empty constructor from Discord
 2020-12-29 21:37:50 -06:00
Ryan
fd725ca6c5
Merge branch 'development' into paldiu-local 2020-12-28 22:51:44 +00:00
Ryan
0703ea685e
Merge branch 'development' into FS-59 2020-12-28 22:51:21 +00:00
speed
7cdeac451b SQL fix 2020-12-28 17:39:07 -05:00
Elmon11
0c60cbc739
Update Command_gcmd.java 2020-12-28 00:18:05 +01:00
Elmon11
402a6be5ad
Make gcmd not work on admins 2020-12-28 00:04:57 +01:00
speed
9d131f0f24 ok codacy 2020-12-26 19:11:15 -05:00
speed
b9606fa0e3 admin chat discord formatting (FS-59) 2020-12-26 18:54:15 -05:00
Paldiu
d71f5452ad Changed instance of SplittableRandom back to Random 
Overridable methods required Random instead of SplittableRandom and caused a build failure in the previous commit. This should fix the build failure.
 2020-12-26 10:30:30 -05:00
Paldiu
eb9759f2d8 Replaced All Instances of Random With SplittableRandom 
SplittableRandom is faster (negligable) than Random and is also able to recursively return new instances of itself for an even more complex pseudo random generator compared to the default Random supplied by Java.
 2020-12-25 15:57:10 -05:00
Paldiu
dec35f76e4 Minor fix 
Switched from a lengthy if else to a ternary.
 2020-12-25 15:51:17 -05:00
Paldiu
97edce0a67 Fixes for Codacy; 
These fixes are designed to satisfy codacy.

However, codacy reports a NPath Complexity of 649, whereas the current, recommended, and standardized threshold is 200.

This is caused by FreedomCommand#execute(CommandSender, String, String[]);
 2020-12-25 15:35:33 -05:00
Paldiu
361aa4ee04 Bugfix on Commit #5c0f77c 
A mismatched argument count during constructor initialization in Module_logs.class was fixed in this patch.
 2020-12-25 15:20:34 -05:00
Paldiu
5c0f77c7c5 Removal of Lombok 
Lombok implementation removal.

I have also gone through and replaced things with inline methods and variables, lambdas, and simplified loops down, removed unnecessary guard clauses, and overall cleaned up every single class. This took a long time, please do remember to follow proper naming conventions, don't include unnecessary guard clauses, follow exception rules and comment rules, and please PLEASE remember to use the DIAMOND OPERATOR rather than just inferring RAW TYPES!!!

Thank you!!
 2020-12-25 14:46:43 -05:00
speed
210b0f8b43 unnecessary 2020-12-24 20:07:09 -05:00
speed
585fdb7992 fix verification toggle breaking everything (FS-39) 2020-12-24 19:48:52 -05:00
Ryan
7bf97a03c4
Update social links in line with live config 
The current server config has these links and those ones commented out. While I do now own them not all of them I'm actively using but thought it'd be good to keep this sync'd up.

Resolves FS-12
 2020-12-24 18:36:27 +00:00
speed
de496970d9 remove reddit system 
jraw free 🦀🦀🦀
 2020-12-24 13:09:42 -05:00
speed
c8ec171b11 Update Discord.java 2020-12-23 20:13:26 -05:00
speed
caf126f543 elmon 
fix underscore italic thing
 2020-12-23 20:09:57 -05:00
speed
a717cce3b5 fix admins being able to see senior commands 2020-12-18 21:43:24 -05:00
speed
ce32490b4d Update Module_list.java 2020-12-16 17:46:27 -05:00
Elmon11
5d882d9052
Update Module_list.java 2020-12-16 23:42:44 +01:00
Elmon11
7dfd6c0b8b
Update Module_list.java 2020-12-16 23:37:14 +01:00
Ryan
fa5c774f45
Remove developer who has been suspended indefintely. 2020-12-15 20:53:07 +00:00
speed
c356ecd168 formatting & rename stuff 2020-12-14 19:05:13 -05:00
SupItsDillon
f8ce64d6c3
Merge pull request #8 from SupItsDillon/development 
FS-5 Allow the verification system to be enabled / disabled in config (2)
 2020-12-14 19:09:57 +00:00
speed
39d5b610a1 Update WorldRestrictions.java 2020-12-12 12:59:19 -05:00
SupItsDillon
50643eb9ff
Update Command_verify.java 
ood code again
 2020-12-09 16:03:40 +00:00
SupItsDillon
687166e0a4
Update Discord.java 
formatting screwed up
 2020-12-09 16:00:18 +00:00
SupItsDillon
98ead06355
Update Command_manuallyverify.java 
ood file
 2020-12-09 15:59:12 +00:00
SupItsDillon
cbc3795ef2
Update Command_playerverification.java 
i should really keep my files updates
 2020-12-09 15:55:45 +00:00
SupItsDillon
b9d608222e
Update Command_playerverification.java 
fixed codacy issue
 2020-12-09 15:48:27 +00:00
SupItsDillon
777a66f8da
Update Discord.java 
correct updated file
 2020-12-09 15:37:31 +00:00
SupItsDillon
6441deceab
Update Command_playerverification.java 
codacy is being fussy
 2020-12-08 19:35:02 +00:00
SupItsDillon
1fedb1fad3
Update Discord.java 
forgot to change this aswell
 2020-12-08 19:28:47 +00:00
SupItsDillon
8b1cef3b83
Update Discord.java 
whoops i did change something i didnt want to
 2020-12-08 19:26:00 +00:00
SupItsDillon
81ef3d624a
Update Discord.java 
cant remember if i changed anything since last commit
 2020-12-08 19:17:06 +00:00
SupItsDillon
b0c0f17043
Update Command_manuallyverify.java 
discord verify enable disable
 2020-12-08 19:16:28 +00:00
SupItsDillon
fb3cdf3603
Update Command_playerverification.java 
discord enable disable verification
 2020-12-08 19:15:55 +00:00
SupItsDillon
950c975e8f
Update Command_verify.java 
discord verification config
 2020-12-08 19:15:17 +00:00
SupItsDillon
79c8ea301d
Update config.yml 
config option for discord verification
 2020-12-08 16:10:14 +00:00
SupItsDillon
7a11c9062d
Update ConfigEntry.java 
config option for verification
 2020-12-08 16:09:26 +00:00
SupItsDillon
2037775276
Update Discord.java 
stuff to disable or enable discord verification
 2020-12-08 16:08:31 +00:00
Ryan
681695150a
Merge pull request #6 from AtlasMediaGroup/Wild1145-patch-1 
Block new CoreProtect stuff better
 2020-12-05 21:10:27 +00:00
Elmon11
e98682a1af
Delete Command_gsay.java 
https://forum.totalfreedom.me/d/114-why-is-gchat-now-gsay-back/13
 2020-12-05 22:05:29 +01:00
Ryan
92534640d4
Block new CoreProtect stuff better 2020-12-05 19:01:09 +00:00
speed
695ccd0e71 /list -a 
/list -s still exists
 2020-12-04 10:37:40 -05:00
speed
0be2aa718f ok 2020-12-03 20:50:30 -05:00
speed
b3b9c2ef43 \ 2020-12-03 20:46:10 -05:00
speed
293ea04c56 staff -> admins 
* rename everything containing staff back to admin (as requested by ryan i've renamed commands like slconfig to saconfig but left "slconfig" as an alias)
* format almost every file correctly
* a few other improvements
 2020-12-03 19:28:53 -05:00
Elmon11
aae1f524ea
updating social and voting links 2020-12-02 22:25:17 +01:00
speed
8ed35aba2b add "Interaction" result action string check 
fixes container interactions being logged as block removals
 2020-12-01 18:53:28 -05:00
Elmon11
4898bcf7b5
Merge pull request #2 from AtlasMediaGroup/Elmon11-patch-1 
reordered response object and reformat
 2020-12-02 00:16:39 +01:00
Elmon11
42199f9923
Update Command_opall.java 2020-12-01 23:45:32 +01:00
Elmon11
03a6f18d18
checks if a player is OP before opping them 
response to
338fc81b7f (r533706741)
 2020-12-01 23:44:00 +01:00
Elmon11
aff12edb03
reordered response object and reformat 
reordered response object and changed senioradmins & masterbuilders to senior_admins & master_builders for consistency with the bot
 2020-12-01 23:10:01 +01:00
speed
28576a9e8b new developers ! ! ! 2020-11-30 19:03:51 -05:00
speed
c1d4e126a3 add block inspector for ops 
* adds /inspect (or /ins) as a /co i replacement command for OPs. container and sign logging are still a WIP for this command.
* replaces "Rank must be Trial Mod or higher." with "Rank must be Admin or higher." in slconfig
* replaces "scripthead is the owner of TotalFreedom." with "Wild1145 is the owner of TotalFreedom." in the config
 2020-11-30 18:17:27 -05:00