Commit Graph

2210 Commits

Author SHA1 Message Date
Ryan
a2243abf2d
Revert "SQL fix" 2021-01-10 20:44:57 +00:00
Ryan
009b983c9a
Merge pull request #15 from AtlasMediaGroup/sql-fix
SQL fix
2021-01-10 20:36:57 +00:00
speed
1b3876cffa
Merge branch 'development' into sql-fix 2021-01-10 15:06:40 -05:00
speed
ed48ce3a8f
Merge pull request #11 from AtlasMediaGroup/paldiu-local
Removal of Lombok
2021-01-10 15:06:22 -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
5754d70d05
Merge branch 'development' into sql-fix 2021-01-07 14:46:13 -05: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
speed
7fb6a2f087
Merge pull request #17 from AtlasMediaGroup/Elmon11-patch-1
Fix developer title not showing up on Offline mode servers
2021-01-03 13:47:14 -05: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
Paldiu
a849e01ce5
Merge pull request #12 from AtlasMediaGroup/FS-59
admin chat discord formatting (FS-59)
2020-12-29 15:34:48 -05: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
1ba468cbfc
Merge branch 'development' into sql-fix 2020-12-28 17:49:11 -05:00
Ryan
91dc89013c
Merge pull request #14 from AtlasMediaGroup/mojangson-update
Mojangson update
2020-12-28 22:44:20 +00:00
speed
7cdeac451b SQL fix 2020-12-28 17:39:07 -05:00
speed
5b8cf2798e Update pom.xml 2020-12-28 17:05:52 -05:00
speed
98158e0f27 mojangson update 2020-12-28 17:04:14 -05:00
Paldiu
c0ac0365eb
Merge pull request #13 from AtlasMediaGroup/Elmon11-patch-1
Make gcmd not work on admins

//MERGE COMMIT:
At least one build check passed, the failing check is irrelevant.
2020-12-28 07:41:58 -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
speed
6d05e9b924
Merge pull request #10 from AtlasMediaGroup/maven-sec
Moved Repo's to HTTPS
2020-12-24 19:33:04 -05:00
Ryan
fb314170c1
Moved Repo's to HTTPS 2020-12-24 22:52:35 +00:00
speed
218d720b06
Merge pull request #9 from AtlasMediaGroup/FS-12
Update social links in line with live config
2020-12-24 14:18:33 -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